197834 2019-05-13 02:00:49 -0700 [MSE][GStreamer] update the readyState correctly in MediaPlayerPrivateGStreamerMSE 2019-06-06 10:19:02 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 bandou.yacine webkit-unassigned aboya bugs-noreply calvaris commit-queue cturner olivier.blin pnormand oldest_to_newest 1535574 0 bandou.yacine 2019-05-13 02:00:49 -0700 The buffering state and the m_downloadFinished boolean aren't supported in MSE case. When the readyState is already "HaveEnoughData", we don't want to revert it to "HaveFutureData", else the MediaPlayer would send a "canplay" event instead of "canplaythrough". 1535582 1 369718 bandou.yacine 2019-05-13 02:12:21 -0700 Created attachment 369718 Patch 1535589 2 369718 pnormand 2019-05-13 03:22:18 -0700 Comment on attachment 369718 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369718&action=review > Source/WebCore/ChangeLog:8 > + The buffering state and the m_downloadFinished boolean aren't supported in MSE case. Why do you think "buffering state" is not supported? m_buffering is about pipeline buffering, not on-disk buffering. 1535594 3 369718 aboya 2019-05-13 04:05:53 -0700 Comment on attachment 369718 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369718&action=review Is there any LayoutTest (existing or new) that is fixed by this patch? If you can provide one, that's informal r+ from me. Even if I end up reworking the readyState handling completely (which will still take quite a while) having the test will help in avoiding me breaking it on accident. >> Source/WebCore/ChangeLog:8 >> + The buffering state and the m_downloadFinished boolean aren't supported in MSE case. > > Why do you think "buffering state" is not supported? m_buffering is about pipeline buffering, not on-disk buffering. m_buffering is set by the parent class in response to GST_MESSAGE_BUFFERING. These messages are sent by network sources, but not by WebKitMediaSrc or appsrc. Also, in the WebKit MSE design the ready state (including HaveFutureData vs HaveEnoughData) is calculated and set by the multi-platform code (see MediaSource::monitorSourceBuffers()), and the player is expected to respect it. This is not what is happening in our current implementation, but I'm working on a revamp of the player where that will be the case and that should fix the issue once released. > Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:-538 > - } else if (m_buffering) { > - if (m_bufferingPercentage == 100) { > - GST_DEBUG("[Buffering] Complete."); > - m_buffering = false; > - m_readyState = MediaPlayer::HaveEnoughData; > - GST_DEBUG("m_readyState=%s", dumpReadyState(m_readyState)); > - m_networkState = m_downloadFinished ? MediaPlayer::Idle : MediaPlayer::Loading; > - } else { > - m_readyState = MediaPlayer::HaveCurrentData; > - GST_DEBUG("m_readyState=%s", dumpReadyState(m_readyState)); > - m_networkState = MediaPlayer::Loading; > - } > - } else if (m_downloadFinished) { > - m_readyState = MediaPlayer::HaveEnoughData; > - GST_DEBUG("m_readyState=%s", dumpReadyState(m_readyState)); > - m_networkState = MediaPlayer::Loaded; I agree this code is unnecessary in the MSE player for the aforementioned reasons. I would argue that long term the same thing could be said for most of the stuff done in the updateStates() method in the MSE player though. > Source/WebCore/platform/graphics/gstreamer/mse/MediaPlayerPrivateGStreamerMSE.cpp:525 > - m_readyState = MediaPlayer::HaveFutureData; > + if (m_readyState < MediaPlayer::HaveFutureData) > + m_readyState = MediaPlayer::HaveFutureData; Makes sense that we don't downgrade the readyState. I wonder, would it work as is if you just completely removed this piece of code? 1536434 4 369955 bandou.yacine 2019-05-15 08:50:40 -0700 Created attachment 369955 Patch 1538331 5 olivier.blin 2019-05-22 13:13:52 -0700 Is it the same as bug 194775 ? 1538642 6 aboya 2019-05-23 06:08:14 -0700 Passes the tests and LGTM. Thank you. 1539496 7 369955 calvaris 2019-05-28 00:19:54 -0700 Comment on attachment 369955 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=369955&action=review > Source/WebCore/ChangeLog:8 > + The buffering state and the m_downloadFinished boolean aren't supported in MSE case. in the MSE case > Source/WebCore/ChangeLog:10 > + else the MediaPlayer would send a "canplay" event instead of "canplaythrough". else -> or else, instead of a > LayoutTests/ChangeLog:8 > + Add a new test that check if the MediaElement receive the "canplaythrough" checks, receives > LayoutTests/media/media-source/media-source-canplaythrough-event.html:18 > + waitForEventOn(video, 'canplaythrough', oncanplaythrough, false, true); I think we can remove oncanplaythrough if we use: waitForEventAndEnd('canplaythrough', null); > LayoutTests/media/media-source/media-source-canplaythrough-event.html:25 > + function oncanplaythrough() { > + passTest("Receive canplaythrough event"); > + } I think we could remove this. 1539603 8 370750 bandou.yacine 2019-05-28 09:19:15 -0700 Created attachment 370750 Patch 1539898 9 370750 commit-queue 2019-05-28 23:00:46 -0700 Comment on attachment 370750 Patch Clearing flags on attachment: 370750 Committed r245848: <https://trac.webkit.org/changeset/245848> 1539899 10 commit-queue 2019-05-28 23:00:48 -0700 All reviewed patches have been landed. Closing bug. 1542465 11 cturner 2019-06-06 10:19:02 -0700 I have proposed this for merging on the 2.24 stable series: https://trac.webkit.org/wiki/WebKitGTK/2.24.x 369718 2019-05-13 02:12:21 -0700 2019-05-15 08:50:36 -0700 Patch bug-197834-20190513111219.patch text/plain 3850 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkMzkxN2EwYjZlY2Zm Mjk1NTg3MWQyNGQ0MTYyZTExOWRiYjM0NC4uMWVjYWUxNGZkMzlkNWQyZjkyMzJmZmY4NjhhMmY3 ZjA3N2Q1ZWViMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDE5LTA1LTEzICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0YXRob21lLmNvbT4KKworICAgICAgICBbTVNF XVtHU3RyZWFtZXJdIHVwZGF0ZSB0aGUgcmVhZHlTdGF0ZSBjb3JyZWN0bHkgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyTVNFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTc4MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgYnVmZmVyaW5nIHN0YXRlIGFuZCB0aGUgbV9kb3dubG9hZEZpbmlz aGVkIGJvb2xlYW4gYXJlbid0IHN1cHBvcnRlZCBpbiBNU0UgY2FzZS4KKyAgICAgICAgV2hlbiB0 aGUgcmVhZHlTdGF0ZSBpcyBhbHJlYWR5ICJIYXZlRW5vdWdoRGF0YSIsIHdlIGRvbid0IHdhbnQg dG8gcmV2ZXJ0IGl0IHRvICJIYXZlRnV0dXJlRGF0YSIsCisgICAgICAgIGVsc2UgdGhlIE1lZGlh UGxheWVyIHdvdWxkIHNlbmQgYSAiY2FucGxheSIgZXZlbnQgaW5zdGVhZCBvZiAiY2FucGxheXRo cm91Z2giLgorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRp YVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQ bGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp1cGRhdGVTdGF0ZXMpOgorCiAyMDE5LTA1LTA5ICBB bnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBFbGVtZW50cyB3aXRo ICJkaXNwbGF5OiBpbmxpbmUtYmxvY2siIGRvbid0IGhhdmUgYSB0b3VjaC1hY3Rpb24gcmVnaW9u CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIv bXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ck1TRS5jcHAKaW5kZXggYWFjMzhjMTdiNzQ2NGIxMjhlYmEzY2Y4NWMzMjNmMWNiODRiOThjYi4u NzE4MWIzODJiNzJhYzFmMTQ2YzI4M2E3ODI0NGJmNzFjYzhjMjg5NSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJNU0UuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFLmNwcApAQCAt NTIwLDI0ICs1MjAsOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6dXBk YXRlU3RhdGVzKCkKICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6 SGF2ZU1ldGFkYXRhOwogICAgICAgICAgICAgICAgIC8vIEZJWE1FOiBTaG91bGQgd2UgbWFuYWdl IE5ldHdvcmtTdGF0ZSB0b28/CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJtX3JlYWR5U3Rh dGU9JXMiLCBkdW1wUmVhZHlTdGF0ZShtX3JlYWR5U3RhdGUpKTsKLSAgICAgICAgICAgIH0gZWxz ZSBpZiAobV9idWZmZXJpbmcpIHsKLSAgICAgICAgICAgICAgICBpZiAobV9idWZmZXJpbmdQZXJj ZW50YWdlID09IDEwMCkgewotICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUcoIltCdWZmZXJp bmddIENvbXBsZXRlLiIpOwotICAgICAgICAgICAgICAgICAgICBtX2J1ZmZlcmluZyA9IGZhbHNl OwotICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUVu b3VnaERhdGE7Ci0gICAgICAgICAgICAgICAgICAgIEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVz IiwgZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRlKSk7Ci0gICAgICAgICAgICAgICAgICAgIG1f bmV0d29ya1N0YXRlID0gbV9kb3dubG9hZEZpbmlzaGVkID8gTWVkaWFQbGF5ZXI6OklkbGUgOiBN ZWRpYVBsYXllcjo6TG9hZGluZzsKLSAgICAgICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUN1cnJlbnREYXRhOwot ICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUcoIm1fcmVhZHlTdGF0ZT0lcyIsIGR1bXBSZWFk eVN0YXRlKG1fcmVhZHlTdGF0ZSkpOwotICAgICAgICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0 ZSA9IE1lZGlhUGxheWVyOjpMb2FkaW5nOwotICAgICAgICAgICAgICAgIH0KLSAgICAgICAgICAg IH0gZWxzZSBpZiAobV9kb3dubG9hZEZpbmlzaGVkKSB7Ci0gICAgICAgICAgICAgICAgbV9yZWFk eVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwotICAgICAgICAgICAgICAgIEdT VF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRlKSk7 Ci0gICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGVkOwog ICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRp YVBsYXllcjo6SGF2ZUZ1dHVyZURhdGE7CisgICAgICAgICAgICAgICAgaWYgKG1fcmVhZHlTdGF0 ZSA8IE1lZGlhUGxheWVyOjpIYXZlRnV0dXJlRGF0YSkKKyAgICAgICAgICAgICAgICAgICAgbV9y ZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVGdXR1cmVEYXRhOwogICAgICAgICAgICAgICAg IEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRl KSk7CiAgICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGlu ZzsKICAgICAgICAgICAgIH0KQEAgLTU1OSwxNCArNTQ0LDE0IEBAIHZvaWQgTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyTVNFOjp1cGRhdGVTdGF0ZXMoKQogICAgICAgICAgICAgICAgIG1fdm9s dW1lQW5kTXV0ZUluaXRpYWxpemVkID0gdHJ1ZTsKICAgICAgICAgICAgIH0KIAotICAgICAgICAg ICAgaWYgKCFzZWVraW5nKCkgJiYgIW1fYnVmZmVyaW5nICYmICFtX3BhdXNlZCAmJiBtX3BsYXli YWNrUmF0ZSkgeworICAgICAgICAgICAgaWYgKCFzZWVraW5nKCkgJiYgIW1fcGF1c2VkICYmIG1f cGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJbQnVmZmVyaW5nXSBS ZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3Rh dGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAgICAgICAgfQogICAgICAgICB9IGVsc2UgaWYg KHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7CiAgICAgICAgICAgICBtX3BhdXNlZCA9IGZh bHNlOwogCi0gICAgICAgICAgICBpZiAoKG1fYnVmZmVyaW5nICYmICFpc0xpdmVTdHJlYW0oKSkg fHwgIW1fcGxheWJhY2tSYXRlKSB7CisgICAgICAgICAgICBpZiAoIW1fcGxheWJhY2tSYXRlKSB7 CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJbQnVmZmVyaW5nXSBQYXVzaW5nIHN0cmVhbSBm b3IgYnVmZmVyaW5nLiIpOwogICAgICAgICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NU X1NUQVRFX1BBVVNFRCk7CiAgICAgICAgICAgICB9Cg== 369955 2019-05-15 08:50:40 -0700 2019-05-28 09:19:10 -0700 Patch bug-197834-20190515175039.patch text/plain 6655 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkMzkxN2EwYjZlY2Zm Mjk1NTg3MWQyNGQ0MTYyZTExOWRiYjM0NC4uY2JlMzcxZjI3YjExNTNlNGNhODJjYzYzM2I3YTc0 M2Q2YWNkNjYwNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTE1ICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0YXRob21lLmNvbT4KKworICAgICAgICBbTVNF XVtHU3RyZWFtZXJdIHVwZGF0ZSB0aGUgcmVhZHlTdGF0ZSBjb3JyZWN0bHkgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyTVNFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTc4MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgYnVmZmVyaW5nIHN0YXRlIGFuZCB0aGUgbV9kb3dubG9hZEZpbmlz aGVkIGJvb2xlYW4gYXJlbid0IHN1cHBvcnRlZCBpbiBNU0UgY2FzZS4KKyAgICAgICAgV2hlbiB0 aGUgcmVhZHlTdGF0ZSBpcyBhbHJlYWR5ICJIYXZlRW5vdWdoRGF0YSIsIHdlIGRvbid0IHdhbnQg dG8gcmV2ZXJ0IGl0IHRvICJIYXZlRnV0dXJlRGF0YSIsCisgICAgICAgIGVsc2UgdGhlIE1lZGlh UGxheWVyIHdvdWxkIHNlbmQgYSAiY2FucGxheSIgZXZlbnQgaW5zdGVhZCBvZiAiY2FucGxheXRo cm91Z2giLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2Ut Y2FucGxheXRocm91Z2gtZXZlbnQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwOgorICAgICAg ICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp1cGRhdGVTdGF0ZXMp OgorCiAyMDE5LTA1LTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNvbT4KIAogICAg ICAgICBFbGVtZW50cyB3aXRoICJkaXNwbGF5OiBpbmxpbmUtYmxvY2siIGRvbid0IGhhdmUgYSB0 b3VjaC1hY3Rpb24gcmVnaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9n cmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAg Yi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAKaW5kZXggYWFjMzhjMTdiNzQ2NGIxMjhlYmEzY2Y4 NWMzMjNmMWNiODRiOThjYi4uNzE4MWIzODJiNzJhYzFmMTQ2YzI4M2E3ODI0NGJmNzFjYzhjMjg5 NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVy L21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwCisrKyBiL1NvdXJjZS9XZWJD b3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQcml2YXRlR1N0 cmVhbWVyTVNFLmNwcApAQCAtNTIwLDI0ICs1MjAsOSBAQCB2b2lkIE1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lck1TRTo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgICAgICAgICBtX3JlYWR5U3Rh dGUgPSBNZWRpYVBsYXllcjo6SGF2ZU1ldGFkYXRhOwogICAgICAgICAgICAgICAgIC8vIEZJWE1F OiBTaG91bGQgd2UgbWFuYWdlIE5ldHdvcmtTdGF0ZSB0b28/CiAgICAgICAgICAgICAgICAgR1NU X0RFQlVHKCJtX3JlYWR5U3RhdGU9JXMiLCBkdW1wUmVhZHlTdGF0ZShtX3JlYWR5U3RhdGUpKTsK LSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9idWZmZXJpbmcpIHsKLSAgICAgICAgICAgICAgICBp ZiAobV9idWZmZXJpbmdQZXJjZW50YWdlID09IDEwMCkgewotICAgICAgICAgICAgICAgICAgICBH U1RfREVCVUcoIltCdWZmZXJpbmddIENvbXBsZXRlLiIpOwotICAgICAgICAgICAgICAgICAgICBt X2J1ZmZlcmluZyA9IGZhbHNlOwotICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBN ZWRpYVBsYXllcjo6SGF2ZUVub3VnaERhdGE7Ci0gICAgICAgICAgICAgICAgICAgIEdTVF9ERUJV RygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRlKSk7Ci0gICAg ICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gbV9kb3dubG9hZEZpbmlzaGVkID8gTWVk aWFQbGF5ZXI6OklkbGUgOiBNZWRpYVBsYXllcjo6TG9hZGluZzsKLSAgICAgICAgICAgICAgICB9 IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6 SGF2ZUN1cnJlbnREYXRhOwotICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUcoIm1fcmVhZHlT dGF0ZT0lcyIsIGR1bXBSZWFkeVN0YXRlKG1fcmVhZHlTdGF0ZSkpOwotICAgICAgICAgICAgICAg ICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpMb2FkaW5nOwotICAgICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9kb3dubG9hZEZpbmlzaGVkKSB7Ci0gICAg ICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVFbm91Z2hEYXRhOwot ICAgICAgICAgICAgICAgIEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5U3Rh dGUobV9yZWFkeVN0YXRlKSk7Ci0gICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBNZWRp YVBsYXllcjo6TG9hZGVkOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAgICBt X3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUZ1dHVyZURhdGE7CisgICAgICAgICAgICAg ICAgaWYgKG1fcmVhZHlTdGF0ZSA8IE1lZGlhUGxheWVyOjpIYXZlRnV0dXJlRGF0YSkKKyAgICAg ICAgICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVGdXR1cmVEYXRh OwogICAgICAgICAgICAgICAgIEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5 U3RhdGUobV9yZWFkeVN0YXRlKSk7CiAgICAgICAgICAgICAgICAgbV9uZXR3b3JrU3RhdGUgPSBN ZWRpYVBsYXllcjo6TG9hZGluZzsKICAgICAgICAgICAgIH0KQEAgLTU1OSwxNCArNTQ0LDE0IEBA IHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp1cGRhdGVTdGF0ZXMoKQogICAg ICAgICAgICAgICAgIG1fdm9sdW1lQW5kTXV0ZUluaXRpYWxpemVkID0gdHJ1ZTsKICAgICAgICAg ICAgIH0KIAotICAgICAgICAgICAgaWYgKCFzZWVraW5nKCkgJiYgIW1fYnVmZmVyaW5nICYmICFt X3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgeworICAgICAgICAgICAgaWYgKCFzZWVraW5nKCkg JiYgIW1fcGF1c2VkICYmIG1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAgICAgR1NUX0RF QlVHKCJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAgICAgICAgICAg IGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAgICAgICAgfQog ICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7CiAgICAgICAg ICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCi0gICAgICAgICAgICBpZiAoKG1fYnVmZmVyaW5nICYm ICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CisgICAgICAgICAgICBpZiAo IW1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJbQnVmZmVyaW5n XSBQYXVzaW5nIHN0cmVhbSBmb3IgYnVmZmVyaW5nLiIpOwogICAgICAgICAgICAgICAgIGNoYW5n ZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCk7CiAgICAgICAgICAgICB9CmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXgg ZjZlZDc2YmU3OTZlOTAyMmExMDFlNzQxMjk0N2QyODk2ZTdiMzlkMi4uZjhkZGIzZTdiMjY3Yjlj NmZkMjI1MTY1MmFlZmJjMzcyN2MzYjIwYiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdl TG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDE5LTA1 LTE1ICBZYWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0YXRob21lLmNvbT4KKworICAg ICAgICBbTVNFXVtHU3RyZWFtZXJdIHVwZGF0ZSB0aGUgcmVhZHlTdGF0ZSBjb3JyZWN0bHkgaW4g TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc4MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgdGVzdCB0aGF0IGNoZWNrIGlmIHRoZSBN ZWRpYUVsZW1lbnQgcmVjZWl2ZSB0aGUgImNhbnBsYXl0aHJvdWdoIgorICAgICAgICBldmVudCB3 aGVuIHRoZSBtZWRpYSBjb250ZW50IGlzIGVudGlyZWx5IGluamVjdGVkIHRvIE1TRSBzb3VyY2VC dWZmZXIuCisKKyAgICAgICAgKiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWNhbnBs YXl0aHJvdWdoLWV2ZW50LWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogbWVkaWEvbWVk aWEtc291cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1ldmVudC5odG1sOiBBZGRlZC4K KwogMjAxOS0wNS0wOSAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAg ICAgRWxlbWVudHMgd2l0aCAiZGlzcGxheTogaW5saW5lLWJsb2NrIiBkb24ndCBoYXZlIGEgdG91 Y2gtYWN0aW9uIHJlZ2lvbgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291 cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1ldmVudC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWNhbnBsYXl0aHJvdWdoLWV2 ZW50LWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xYTBjZjE2MmEzYzZhYTJkMjkzZjY1ZmRkMjMw ZDA4OGEwZGNkNGQ4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvbWVkaWEvbWVkaWEt c291cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1ldmVudC1leHBlY3RlZC50eHQKQEAg LTAsMCArMSw2IEBACisKK0VWRU5UKHNvdXJjZW9wZW4pCitFVkVOVChjYW5wbGF5dGhyb3VnaCkK K1JlY2VpdmUgY2FucGxheXRocm91Z2ggZXZlbnQgT0sKK0VORCBPRiBURVNUCisKZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtY2FucGxheXRo cm91Z2gtZXZlbnQuaHRtbCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1z b3VyY2UtY2FucGxheXRocm91Z2gtZXZlbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5lYjIwNGI4ZWJmNjE1 ZmMwZjlhMmViNGI1YjQ0OWU0YmRhMDkxOWRiCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1ldmVudC5o dG1sCkBAIC0wLDAgKzEsMzEgQEAKKzxodG1sPgorPGhlYWQ+CisgICAgPHRpdGxlPm1lZGlhLXNv dXJjZS13YWl0LWNhbnBsYXl0aHJvdWdoLWV2ZW50PC90aXRsZT4KKyAgICA8c2NyaXB0IHNyYz0i Li4vdmlkZW8tdGVzdC5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdD4KKyAgICB2YXIgc291cmNl OworICAgIHZhciBzb3VyY2VCdWZmZXJWaWRlbzsKKworICAgIGZ1bmN0aW9uIHJ1blRlc3QoKSB7 CisgICAgICAgIGZpbmRNZWRpYUVsZW1lbnQoKTsKKyAgICAgICAgc291cmNlID0gbmV3IE1lZGlh U291cmNlKCk7CisgICAgICAgIHdhaXRGb3JFdmVudCgnc291cmNlb3BlbicsIHNvdXJjZU9wZW4s IGZhbHNlLCBmYWxzZSwgc291cmNlKTsKKyAgICAgICAgdmlkZW8uc3JjID0gVVJMLmNyZWF0ZU9i amVjdFVSTChzb3VyY2UpOworICAgIH0KKworICAgIGFzeW5jIGZ1bmN0aW9uIHNvdXJjZU9wZW4o KSB7CisgICAgICAgIHNvdXJjZUJ1ZmZlclZpZGVvID0gc291cmNlLmFkZFNvdXJjZUJ1ZmZlcign dmlkZW8vbXA0OyBjb2RlY3M9ImF2YzEuNGQ0MDFmIicpOworICAgICAgICB3YWl0Rm9yRXZlbnRP bih2aWRlbywgJ2NhbnBsYXl0aHJvdWdoJywgb25jYW5wbGF5dGhyb3VnaCwgZmFsc2UsIHRydWUp OworICAgICAgICBzb3VyY2VCdWZmZXJWaWRlby5hcHBlbmRCdWZmZXIoYXdhaXQgKGF3YWl0IGZl dGNoKCJjb250ZW50L3Rlc3QtcmVkLTNzLTQ4MHgzNjAubXA0IikpLmFycmF5QnVmZmVyKCkpOwor ICAgICAgICBmYWlsVGVzdEluKDIwMDApOworICAgIH0KKworICAgIGZ1bmN0aW9uIG9uY2FucGxh eXRocm91Z2goKSB7CisgICAgICAgIHBhc3NUZXN0KCJSZWNlaXZlIGNhbnBsYXl0aHJvdWdoIGV2 ZW50Iik7CisgICAgfQorICAgIDwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgb25sb2FkPSJydW5U ZXN0KCkiPgorPHZpZGVvPjwvdmlkZW8+Cis8L2JvZHk+Cis8L2h0bWw+Cg== 370750 2019-05-28 09:19:15 -0700 2019-05-28 23:00:46 -0700 Patch bug-197834-20190528181913.patch text/plain 6512 bandou.yacine U3VidmVyc2lvbiBSZXZpc2lvbjogMjQ1MTI3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzFkMzkxN2EwYjZlY2Zm Mjk1NTg3MWQyNGQ0MTYyZTExOWRiYjM0NC4uMGI4MjM1Mjk1YTE5N2ZlYWRiZDM5NzYwNzFhYmMy NWI2NzMxZWI4ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE5LTA1LTE1ICBZYWNp bmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0YXRob21lLmNvbT4KKworICAgICAgICBbTVNF XVtHU3RyZWFtZXJdIHVwZGF0ZSB0aGUgcmVhZHlTdGF0ZSBjb3JyZWN0bHkgaW4gTWVkaWFQbGF5 ZXJQcml2YXRlR1N0cmVhbWVyTVNFCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0xOTc4MzQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUaGUgYnVmZmVyaW5nIHN0YXRlIGFuZCB0aGUgbV9kb3dubG9hZEZpbmlz aGVkIGJvb2xlYW4gYXJlbid0IHN1cHBvcnRlZCBpbiB0aGUgTVNFIGNhc2UuCisgICAgICAgIFdo ZW4gdGhlIHJlYWR5U3RhdGUgaXMgYWxyZWFkeSAiSGF2ZUVub3VnaERhdGEiLCB3ZSBkb24ndCB3 YW50IHRvIHJldmVydCBpdCB0byAiSGF2ZUZ1dHVyZURhdGEiLAorICAgICAgICBvciBlbHNlIHRo ZSBNZWRpYVBsYXllciB3b3VsZCBzZW5kIGEgImNhbnBsYXkiIGV2ZW50IGluc3RlYWQgb2YgYSAi Y2FucGxheXRocm91Z2giLgorCisgICAgICAgIFRlc3Q6IG1lZGlhL21lZGlhLXNvdXJjZS9tZWRp YS1zb3VyY2UtY2FucGxheXRocm91Z2gtZXZlbnQuaHRtbAorCisgICAgICAgICogcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6TWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp1cGRh dGVTdGF0ZXMpOgorCiAyMDE5LTA1LTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KIAogICAgICAgICBFbGVtZW50cyB3aXRoICJkaXNwbGF5OiBpbmxpbmUtYmxvY2siIGRvbid0 IGhhdmUgYSB0b3VjaC1hY3Rpb24gcmVnaW9uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNlL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ck1TRS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvbXNl L01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lck1TRS5jcHAKaW5kZXggYWFjMzhjMTdiNzQ2NGIx MjhlYmEzY2Y4NWMzMjNmMWNiODRiOThjYi4uNzE4MWIzODJiNzJhYzFmMTQ2YzI4M2E3ODI0NGJm NzFjYzhjMjg5NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL21zZS9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXJNU0UuY3BwCisrKyBiL1Nv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9tc2UvTWVkaWFQbGF5ZXJQ cml2YXRlR1N0cmVhbWVyTVNFLmNwcApAQCAtNTIwLDI0ICs1MjAsOSBAQCB2b2lkIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lck1TRTo6dXBkYXRlU3RhdGVzKCkKICAgICAgICAgICAgICAgICBt X3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZU1ldGFkYXRhOwogICAgICAgICAgICAgICAg IC8vIEZJWE1FOiBTaG91bGQgd2UgbWFuYWdlIE5ldHdvcmtTdGF0ZSB0b28/CiAgICAgICAgICAg ICAgICAgR1NUX0RFQlVHKCJtX3JlYWR5U3RhdGU9JXMiLCBkdW1wUmVhZHlTdGF0ZShtX3JlYWR5 U3RhdGUpKTsKLSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9idWZmZXJpbmcpIHsKLSAgICAgICAg ICAgICAgICBpZiAobV9idWZmZXJpbmdQZXJjZW50YWdlID09IDEwMCkgewotICAgICAgICAgICAg ICAgICAgICBHU1RfREVCVUcoIltCdWZmZXJpbmddIENvbXBsZXRlLiIpOwotICAgICAgICAgICAg ICAgICAgICBtX2J1ZmZlcmluZyA9IGZhbHNlOwotICAgICAgICAgICAgICAgICAgICBtX3JlYWR5 U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUVub3VnaERhdGE7Ci0gICAgICAgICAgICAgICAgICAg IEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRl KSk7Ci0gICAgICAgICAgICAgICAgICAgIG1fbmV0d29ya1N0YXRlID0gbV9kb3dubG9hZEZpbmlz aGVkID8gTWVkaWFQbGF5ZXI6OklkbGUgOiBNZWRpYVBsYXllcjo6TG9hZGluZzsKLSAgICAgICAg ICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRp YVBsYXllcjo6SGF2ZUN1cnJlbnREYXRhOwotICAgICAgICAgICAgICAgICAgICBHU1RfREVCVUco Im1fcmVhZHlTdGF0ZT0lcyIsIGR1bXBSZWFkeVN0YXRlKG1fcmVhZHlTdGF0ZSkpOwotICAgICAg ICAgICAgICAgICAgICBtX25ldHdvcmtTdGF0ZSA9IE1lZGlhUGxheWVyOjpMb2FkaW5nOwotICAg ICAgICAgICAgICAgIH0KLSAgICAgICAgICAgIH0gZWxzZSBpZiAobV9kb3dubG9hZEZpbmlzaGVk KSB7Ci0gICAgICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVFbm91 Z2hEYXRhOwotICAgICAgICAgICAgICAgIEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwgZHVt cFJlYWR5U3RhdGUobV9yZWFkeVN0YXRlKSk7Ci0gICAgICAgICAgICAgICAgbV9uZXR3b3JrU3Rh dGUgPSBNZWRpYVBsYXllcjo6TG9hZGVkOwogICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAg ICAgICAgICBtX3JlYWR5U3RhdGUgPSBNZWRpYVBsYXllcjo6SGF2ZUZ1dHVyZURhdGE7CisgICAg ICAgICAgICAgICAgaWYgKG1fcmVhZHlTdGF0ZSA8IE1lZGlhUGxheWVyOjpIYXZlRnV0dXJlRGF0 YSkKKyAgICAgICAgICAgICAgICAgICAgbV9yZWFkeVN0YXRlID0gTWVkaWFQbGF5ZXI6OkhhdmVG dXR1cmVEYXRhOwogICAgICAgICAgICAgICAgIEdTVF9ERUJVRygibV9yZWFkeVN0YXRlPSVzIiwg ZHVtcFJlYWR5U3RhdGUobV9yZWFkeVN0YXRlKSk7CiAgICAgICAgICAgICAgICAgbV9uZXR3b3Jr U3RhdGUgPSBNZWRpYVBsYXllcjo6TG9hZGluZzsKICAgICAgICAgICAgIH0KQEAgLTU1OSwxNCAr NTQ0LDE0IEBAIHZvaWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFOjp1cGRhdGVTdGF0 ZXMoKQogICAgICAgICAgICAgICAgIG1fdm9sdW1lQW5kTXV0ZUluaXRpYWxpemVkID0gdHJ1ZTsK ICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgaWYgKCFzZWVraW5nKCkgJiYgIW1fYnVmZmVy aW5nICYmICFtX3BhdXNlZCAmJiBtX3BsYXliYWNrUmF0ZSkgeworICAgICAgICAgICAgaWYgKCFz ZWVraW5nKCkgJiYgIW1fcGF1c2VkICYmIG1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAg ICAgR1NUX0RFQlVHKCJbQnVmZmVyaW5nXSBSZXN0YXJ0aW5nIHBsYXliYWNrLiIpOwogICAgICAg ICAgICAgICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BMQVlJTkcpOwogICAgICAg ICAgICAgfQogICAgICAgICB9IGVsc2UgaWYgKHN0YXRlID09IEdTVF9TVEFURV9QTEFZSU5HKSB7 CiAgICAgICAgICAgICBtX3BhdXNlZCA9IGZhbHNlOwogCi0gICAgICAgICAgICBpZiAoKG1fYnVm ZmVyaW5nICYmICFpc0xpdmVTdHJlYW0oKSkgfHwgIW1fcGxheWJhY2tSYXRlKSB7CisgICAgICAg ICAgICBpZiAoIW1fcGxheWJhY2tSYXRlKSB7CiAgICAgICAgICAgICAgICAgR1NUX0RFQlVHKCJb QnVmZmVyaW5nXSBQYXVzaW5nIHN0cmVhbSBmb3IgYnVmZmVyaW5nLiIpOwogICAgICAgICAgICAg ICAgIGNoYW5nZVBpcGVsaW5lU3RhdGUoR1NUX1NUQVRFX1BBVVNFRCk7CiAgICAgICAgICAgICB9 CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKaW5kZXggZjZlZDc2YmU3OTZlOTAyMmExMDFlNzQxMjk0N2QyODk2ZTdiMzlkMi4uODhiM2Q1 OTM3N2I0NGM1ZTYwZDc2MDI3NDNlYTljZDgyNGExNWZiNiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVz dHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBA CisyMDE5LTA1LTE1ICBZYWNpbmUgQmFuZG91ICA8eWFjaW5lLmJhbmRvdUBzb2Z0YXRob21lLmNv bT4KKworICAgICAgICBbTVNFXVtHU3RyZWFtZXJdIHVwZGF0ZSB0aGUgcmVhZHlTdGF0ZSBjb3Jy ZWN0bHkgaW4gTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyTVNFCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTc4MzQKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgYSBuZXcgdGVzdCB0aGF0IGNoZWNr cyBpZiB0aGUgTWVkaWFFbGVtZW50IHJlY2VpdmVzIHRoZSAiY2FucGxheXRocm91Z2giCisgICAg ICAgIGV2ZW50IHdoZW4gdGhlIG1lZGlhIGNvbnRlbnQgaXMgZW50aXJlbHkgaW5qZWN0ZWQgdG8g TVNFIHNvdXJjZUJ1ZmZlci4KKworICAgICAgICAqIG1lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1z b3VyY2UtY2FucGxheXRocm91Z2gtZXZlbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAg KiBtZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWNhbnBsYXl0aHJvdWdoLWV2ZW50Lmh0 bWw6IEFkZGVkLgorCiAyMDE5LTA1LTA5ICBBbnR0aSBLb2l2aXN0byAgPGFudHRpQGFwcGxlLmNv bT4KIAogICAgICAgICBFbGVtZW50cyB3aXRoICJkaXNwbGF5OiBpbmxpbmUtYmxvY2siIGRvbid0 IGhhdmUgYSB0b3VjaC1hY3Rpb24gcmVnaW9uCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9tZWRp YS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWNhbnBsYXl0aHJvdWdoLWV2ZW50LWV4cGVjdGVk LnR4dCBiL0xheW91dFRlc3RzL21lZGlhL21lZGlhLXNvdXJjZS9tZWRpYS1zb3VyY2UtY2FucGxh eXRocm91Z2gtZXZlbnQtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjNmNmFmYjI1MTk1MjRjNjZj OTQwNGMxZDMxNDBkNTgyMTJhMzQzOTUKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9t ZWRpYS9tZWRpYS1zb3VyY2UvbWVkaWEtc291cmNlLWNhbnBsYXl0aHJvdWdoLWV2ZW50LWV4cGVj dGVkLnR4dApAQCAtMCwwICsxLDUgQEAKKworRVZFTlQoc291cmNlb3BlbikKK0VWRU5UKGNhbnBs YXl0aHJvdWdoKQorRU5EIE9GIFRFU1QKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvbWVkaWEv bWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1ldmVudC5odG1sIGIvTGF5 b3V0VGVzdHMvbWVkaWEvbWVkaWEtc291cmNlL21lZGlhLXNvdXJjZS1jYW5wbGF5dGhyb3VnaC1l dmVudC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmExYjU0ZTExM2ExMjBkYjg3NzY2MGY5ZjM4MTdlNTllOWJi Y2ZhY2EKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9tZWRpYS9tZWRpYS1zb3VyY2Uv bWVkaWEtc291cmNlLWNhbnBsYXl0aHJvdWdoLWV2ZW50Lmh0bWwKQEAgLTAsMCArMSwyOCBAQAor PGh0bWw+Cis8aGVhZD4KKyAgICA8dGl0bGU+bWVkaWEtc291cmNlLXdhaXQtY2FucGxheXRocm91 Z2gtZXZlbnQ8L3RpdGxlPgorICAgIDxzY3JpcHQgc3JjPSIuLi92aWRlby10ZXN0LmpzIj48L3Nj cmlwdD4KKyAgICA8c2NyaXB0PgorICAgIHZhciBzb3VyY2U7CisgICAgdmFyIHNvdXJjZUJ1ZmZl clZpZGVvOworCisgICAgZnVuY3Rpb24gcnVuVGVzdCgpIHsKKyAgICAgICAgZmluZE1lZGlhRWxl bWVudCgpOworICAgICAgICBzb3VyY2UgPSBuZXcgTWVkaWFTb3VyY2UoKTsKKyAgICAgICAgd2Fp dEZvckV2ZW50KCdzb3VyY2VvcGVuJywgc291cmNlT3BlbiwgZmFsc2UsIGZhbHNlLCBzb3VyY2Up OworICAgICAgICB2aWRlby5zcmMgPSBVUkwuY3JlYXRlT2JqZWN0VVJMKHNvdXJjZSk7CisgICAg fQorCisgICAgYXN5bmMgZnVuY3Rpb24gc291cmNlT3BlbigpIHsKKyAgICAgICAgc291cmNlQnVm ZmVyVmlkZW8gPSBzb3VyY2UuYWRkU291cmNlQnVmZmVyKCd2aWRlby9tcDQ7IGNvZGVjcz0iYXZj MS40ZDQwMWYiJyk7CisgICAgICAgIHdhaXRGb3JFdmVudEFuZEVuZCgnY2FucGxheXRocm91Z2gn LCBudWxsKTsKKyAgICAgICAgc291cmNlQnVmZmVyVmlkZW8uYXBwZW5kQnVmZmVyKGF3YWl0IChh d2FpdCBmZXRjaCgiY29udGVudC90ZXN0LXJlZC0zcy00ODB4MzYwLm1wNCIpKS5hcnJheUJ1ZmZl cigpKTsKKyAgICAgICAgZmFpbFRlc3RJbigyMDAwKTsKKyAgICB9CisKKyAgICA8L3NjcmlwdD4K KzwvaGVhZD4KKzxib2R5IG9ubG9hZD0icnVuVGVzdCgpIj4KKzx2aWRlbz48L3ZpZGVvPgorPC9i b2R5PgorPC9odG1sPgo=