205801 2020-01-06 07:39:13 -0800 [GStreamer] Streaming aac/mp3 audio doesn't always work 2020-03-06 04:42:13 -0800 1 1 1 Unclassified WebKit Media Other Other Linux RESOLVED FIXED InRadar P2 Normal --- 1 bugzilla eocanha calvaris cgarcia commit-queue eocanha eric.carlson ews-watchlist glenn gustavo jer.noble menard philipj pnormand sergio vjaquez webkit-bug-importer oldest_to_newest 1603035 0 bugzilla 2020-01-06 07:39:13 -0800 Midori (on Raspbian Buster) does not play some radio stations correctly when using the audio tag. The following HTML snippet can be used to reproduce the problem: <p>The Breeze</p> <audio controls src="https://stream.celador.co.uk/breeze-nglos-96.aac" preload="none"></audio> <p>BBC Radio 4</p> <audio controls src="http://bbcmedia.ic.llnwd.net/stream/bbcmedia_radio4fm_mf_p#.mp3" preload="none"></audio> <p>Absolute 80s</p> <audio controls src="https://ais.absoluteradio.co.uk/absolute80smed.aac" preload="none"></audio> These are audio tags for 3 different UK radio stations. The Breeze plays for 5s then stops. BBC Radio 4 plays for 10-30s and then stops. Absolute radio plays longer but sometines eventually stops. This behaviour has been confirmed with Midori 8.0 on Raspbian Buster and Midori 9.0 on Linux Desktop. But it happens too with Epiphany, Surf and Ephemeral (all use Webkitgtk2 as backend). Streams work prefectly using gst123 or any other gstreamer frontend. So, it seems to be a Webkitgtk2 issue. 1605526 1 pnormand 2020-01-11 09:32:06 -0800 Which version of webkitgtk are you using? 1605530 2 bugzilla 2020-01-11 09:39:02 -0800 I am using Midori v8.0 which uses webkit2gtk-4.0, according to what I can find in the build files. 1605532 3 pnormand 2020-01-11 09:51:10 -0800 (In reply to bugzilla from comment #2) > webkit2gtk-4.0, according to what I can > find in the build files. That's not the version I'm looking for. What's the package version? 2.26.2 ? 1605567 4 bugzilla 2020-01-11 14:23:15 -0800 2.16.6, I think, according to these lines in the make file: pkg_check_modules(DEPS_GTK REQUIRED gtk+-3.0>=3.12.0 webkit2gtk-4.0>=2.16.6 gcr-ui-3>=2.32 libpeas-gtk-1.0 json-glib-1.0>=0.12 libarchive ) 1605637 5 pnormand 2020-01-12 03:47:28 -0800 No, that's the minimum version required, not necessarily the detected version... Can you attach the midori build logs? 1605639 6 pnormand 2020-01-12 03:50:09 -0800 Or simply the output of: pkg-config --modversion webkit2gtk-4.0 1605691 7 bugzilla 2020-01-12 13:37:32 -0800 pkg-config reports 2.26.2 1605780 8 pnormand 2020-01-13 02:40:55 -0800 I can reproduce the bug, the problem is that our httpsrc element quickly assumes those live stream have a content-length, hence EOS is pushed too early and playback stops :( This works-around the bug, but might introduce other layout test failures, so it should be properly investigated: diff --git a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp index 3dae81aa68d..6be6193ffd1 100644 --- a/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp +++ b/Source/WebCore/platform/graphics/gstreamer/WebKitWebSourceGStreamer.cpp @@ -1171,10 +1171,10 @@ void CachedResourceStreamingClient::dataReceived(PlatformMediaResource&, const c if (priv->haveSize && (newPosition > priv->size)) { GST_DEBUG_OBJECT(src, "Got position previous estimated content size (%" G_GINT64_FORMAT " > %" G_GINT64_FORMAT ")", newPosition, priv->size); newSize = newPosition; - } else if (!priv->haveSize) { - GST_DEBUG_OBJECT(src, "Got initial response without Content-Length, assuming response size as duration."); - newSize = length; - priv->haveSize = true; + // } else if (!priv->haveSize) { + // GST_DEBUG_OBJECT(src, "Got initial response without Content-Length, assuming response size as duration."); + // newSize = length; + // priv->haveSize = true; } if (newSize) { 1618507 9 390651 eocanha 2020-02-13 08:45:05 -0800 Created attachment 390651 Patch 1618519 10 390656 eocanha 2020-02-13 09:06:00 -0800 Created attachment 390656 Patch 1618533 11 390656 calvaris 2020-02-13 09:25:07 -0800 Comment on attachment 390656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390656&action=review > LayoutTests/http/tests/media/video-no-content-length.html:22 > + testExpected("video.duration == Infinity", true); shouldn't this be testExpected(video.duration, Infinity) ? That way the expectation would make more sense. 1618542 12 390660 eocanha 2020-02-13 09:48:22 -0800 Created attachment 390660 Patch 1618583 13 390660 pnormand 2020-02-13 10:44:07 -0800 Comment on attachment 390660 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=390660&action=review Looks like the new test times out on mac-wk1 and mac-wk2 > LayoutTests/http/tests/media/resources/video-no-content-length.php:10 > + header("Content-Type: video/mp4"); > + $fileName = "test.mp4"; > + } else if ($extension == 'ogv') { > + header("Content-Type: video/ogg"); 4 spaces indentation please ;) > LayoutTests/http/tests/media/video-no-content-length.html:8 > +<script src=../../media-resources/video-test.js></script> > +<script src=../../media-resources/media-file.js></script> > +<script> i think script tags usually go in the head? > LayoutTests/http/tests/media/video-no-content-length.html:17 > + video.src="http://127.0.0.1:8000/media/resources/video-no-content-length.php?video="+movie; missing spaces surrounding the = 1618689 14 eric.carlson 2020-02-13 13:41:47 -0800 (In reply to Philippe Normand from comment #13) > Comment on attachment 390660 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=390660&action=review > > Looks like the new test times out on mac-wk1 and mac-wk2 > Your new php won't work on macOS or iOS unless it supports range requests. LayoutTests/http/tests/media/resources/serve-video.php already supports omitting the 'Content-Length' header, so you should be able to add a new option to LayoutTests/http/tests/media/resources/load-video.php to enable it for your test instead of adding range support to the new script. 1619066 15 eocanha 2020-02-14 10:16:19 -0800 (In reply to Eric Carlson from comment #14) > Your new php won't work on macOS or iOS unless it supports range requests. > > LayoutTests/http/tests/media/resources/serve-video.php already supports > omitting the 'Content-Length' header, so you should be able to add a new > option to LayoutTests/http/tests/media/resources/load-video.php to enable it > for your test instead of adding range support to the new script. Thanks for the suggestion, Eric. I've modified the test to use load-video.php here locally (patch not submitted yet) and now it "works" on macOS. However, I'm getting a finite duration there instead of Infinite. It might be because the test.mp4 file used is a standalone file, while the ideal test case should be a stream like the one used in the Breeze radio stream (see original bug report). If I open a webpage with that stream in Safari, I get NaN before starting playback and then Infinite after playback start. I should find a way to replicate that behaviour in the test or just skip it completely on Mac. 1626225 16 392604 eocanha 2020-03-05 11:43:23 -0800 Created attachment 392604 Patch 1626228 17 eocanha 2020-03-05 11:55:44 -0800 Looks like I was testing the wrong thing in the previous layout test. I was focusing too much on the duration, but that was only known after the video (now audio) had detected end-of-stream (EOS) and stopped. I had to do a lot of empirical tests with lengths, chunk sizes, Icy headers and other stuff, but in the end I've finally managed to simulate a real live stream in this patch by stalling the server and not providing all the data at once. On the previous GStreamer code, this was detected as EOS and the audio stopped, showing a duration smaller than the real one (or Infinity on a real live stream). I couldn't check for an exact currentTime because the Mac and GStreamer ports give different exact values. I just check if it's approximately higher than 6 sec and that fits all ports. This time I've double checked that the new test fails without the patch (on GStreamer, in Mac it already passed), passes with the patch, and the modifications in serve-video.php don't create any regression in video-play-waiting.html and video-play-stall.html in Mac (the other tests using stallOffset/stallDuration). 1626596 18 392604 pnormand 2020-03-06 03:30:58 -0800 Comment on attachment 392604 Patch LGTM. Thanks Enrique 1626613 19 392604 commit-queue 2020-03-06 04:41:31 -0800 Comment on attachment 392604 Patch Clearing flags on attachment: 392604 Committed r257977: <https://trac.webkit.org/changeset/257977> 1626614 20 commit-queue 2020-03-06 04:41:34 -0800 All reviewed patches have been landed. Closing bug. 1626615 21 webkit-bug-importer 2020-03-06 04:42:13 -0800 <rdar://problem/60143165> 390651 2020-02-13 08:45:05 -0800 2020-02-13 09:05:57 -0800 Patch bug-205801-20200213164503.patch text/plain 7009 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkyZmYzNTcwNjczZjFj ODI1NGE3NDVkZWY3ZjZkMzVhZWU1NTZjZi4uMjgwYmM3NTRiNDliMjY0OTYxMGJhZGE5MmMyMTBj NDliOTU5MGU3MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDIwLTAyLTEzICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgcmVseSBv biByZXNwb25zZSBzaXplIHRvIHJlcGxhY2UgQ29udGVudC1MZW5ndGguIFRoaXMgbWF5IGJyZWFr IHN0cmVhbWluZyB2aWRlb3MsCisgICAgICAgIHdoaWNoIHNob3VsZCBhbHdheXMgaGF2ZSBhbiBJ bmZpbml0ZSBkdXJhdGlvbi4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVv LW5vLWNvbnRlbnQtbGVuZ3RoLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dz dHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoQ2FjaGVkUmVz b3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMjAtMDItMDQgIEFudHRp IEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIENTUyBSdWxlcyB3aXRoIHRo ZSBzYW1lIHNlbGVjdG9yIGZyb20gc2V2ZXJhbCBsYXJnZSBzdHlsZXNoZWV0cyBhcmUgYXBwbGll ZCBpbiB0aGUgd3Jvbmcgb3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJl YW1lci5jcHAKaW5kZXggMDYwZGY3MWJmY2MyZGM2NzdiMjIwNmI4ZTA0ODA1YTc2NWUzMjIyMS4u YzI2MTk4NGM1MzQ2YjM3N2U3NTJhY2Y1NDgwZjIzZTBmZGE1MjdkOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdT dHJlYW1lci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVh bWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKQEAgLTExNzEsMTAgKzExNzEsNiBAQCB2 b2lkIENhY2hlZFJlc291cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1N ZWRpYVJlc291cmNlJiwgY29uc3QgYwogICAgIGlmIChwcml2LT5oYXZlU2l6ZSAmJiAobmV3UG9z aXRpb24gPiBwcml2LT5zaXplKSkgewogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkdv dCBwb3NpdGlvbiBwcmV2aW91cyBlc3RpbWF0ZWQgY29udGVudCBzaXplICglIiBHX0dJTlQ2NF9G T1JNQVQgIiA+ICUiIEdfR0lOVDY0X0ZPUk1BVCAiKSIsIG5ld1Bvc2l0aW9uLCBwcml2LT5zaXpl KTsKICAgICAgICAgbmV3U2l6ZSA9IG5ld1Bvc2l0aW9uOwotICAgIH0gZWxzZSBpZiAoIXByaXYt PmhhdmVTaXplKSB7Ci0gICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiR290IGluaXRpYWwg cmVzcG9uc2Ugd2l0aG91dCBDb250ZW50LUxlbmd0aCwgYXNzdW1pbmcgcmVzcG9uc2Ugc2l6ZSBh cyBkdXJhdGlvbi4iKTsKLSAgICAgICAgbmV3U2l6ZSA9IGxlbmd0aDsKLSAgICAgICAgcHJpdi0+ aGF2ZVNpemUgPSB0cnVlOwogICAgIH0KIAogICAgIGlmIChuZXdTaXplKSB7CmRpZmYgLS1naXQg YS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDgy OGE4NTAxNGViMWNjMmVkNDZkNTFkM2NlNzcyMTMzM2RjODkwMC4uNzM0MmEzOGM2NzdjNmQwZGI4 OGI2M2ZkNmRkYjljNWU4YTE2MDQwMCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9n CisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTEz ICBFbnJpcXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAg ICAgW0dTdHJlYW1lcl0gU3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29y aworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3BlY2lm eSBDb250ZW50LUxlbmd0aCB3aGVuIHBhc3NpbmcgbWVkaWEgZmlsZSB0aHJvdWdoLiBPdGhlcndp c2UgdGhlIEdTdHJlYW1lciBpbXBsZW1lbnRhdGlvbgorICAgICAgICBuZWVkcyB0byByZWx5IG9u IHJlc3BvbnNlIHNpemUgYW5kIHRoYXQgY3JlYXRlcyBvdGhlciBpc3N1ZXMuIFRoaXMgc2hvdWxk bid0IGFmZmVjdCB0aGUgb3JpZ2luYWwKKyAgICAgICAgdGVzdCBwdXJwb3NlLCB3aGljaCBpcyB0 byBjaGVjayBpZiBjb29raWVzIGFyZSBob25vcmVkIHdoZW4gbG9hZGluZyB2aWRlbyBhc3NldHMu CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hl Y2stY29va2llLnBocDogU3BlY2lmeSBDb250ZW50LUxlbmd0aC4KKyAgICAgICAgKiBodHRwL3Rl c3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1uby1jb250ZW50LWxlbmd0aC5waHA6IENvcGllZCBm cm9tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLWNvb2tpZS1j aGVjay1jb29raWUucGhwLgorICAgICAgICBTaW1pbGFyIGZpbGUgcGFzc3Rocm91Z2ggYnV0IHVz aW5nIGEgR0VUIHBhcmFtZXRlciBpbnN0ZWFkIG9mIGNvb2tpZXMgYW5kIG5vdCBzcGVjaWZ5aW5n IENvbnRlbnQtTGVuZ3RoLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29u dGVudC1sZW5ndGguaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2h0dHAvdGVz dHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwog MjAyMC0wMi0wNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAg Q1NTIFJ1bGVzIHdpdGggdGhlIHNhbWUgc2VsZWN0b3IgZnJvbSBzZXZlcmFsIGxhcmdlIHN0eWxl c2hlZXRzIGFyZSBhcHBsaWVkIGluIHRoZSB3cm9uZyBvcmRlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJjZXMvdmlkZW8tY29va2llLWNoZWNrLWNvb2tp ZS5waHAgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29r aWUtY2hlY2stY29va2llLnBocAppbmRleCA0MmQ3NTBmNGM1NDJmYTgwMzYxMjhjNDVkMjRkOGVm OGNlZGZlMTc2Li44ZWVkNWY4Mjg0ZTJjZDg0NmI0ZGUxMTdiNWRjMWNiODA4YTIyMzRmIDEwMDY0 NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29r aWUtY2hlY2stY29va2llLnBocAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jl c291cmNlcy92aWRlby1jb29raWUtY2hlY2stY29va2llLnBocApAQCAtMTYsNiArMTYsNyBAQAog CiAgICAgICAgIGhlYWRlcigiQ2FjaGUtQ29udHJvbDogbm8tc3RvcmUiKTsKICAgICAgICAgaGVh ZGVyKCJDb25uZWN0aW9uOiBjbG9zZSIpOworICAgICAgICBoZWFkZXIoIkNvbnRlbnQtTGVuZ3Ro OiAiIC4gZmlsZXNpemUoJGZpbGVOYW1lKSk7CiAKICAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVO YW1lLCAiciIpOwogICAgICAgICBmcGFzc3RocnUoJGZuKTsKZGlmZiAtLWdpdCBhL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLnBo cCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLW5vLWNvbnRl bnQtbGVuZ3RoLnBocApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zM2RlOWE0MzY1ODhiOTNkMTE0YWMzZmY4OGVlYTUz NGI2ODc5NGJjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS9yZXNvdXJjZXMvdmlkZW8tbm8tY29udGVudC1sZW5ndGgucGhwCkBAIC0wLDAgKzEsMjYgQEAK Kzw/cGhwCisgICAgaWYoJF9HRVRbInZpZGVvIl0pCisgICAgeworICAgICAgICAkdmlkZW9maWxl ID0KKyAgICAgICAgJGV4dGVuc2lvbiA9IHBhdGhpbmZvKCRfR0VUWyJ2aWRlbyJdLCBQQVRISU5G T19FWFRFTlNJT04pOworICAgICAgICBpZiAoJGV4dGVuc2lvbiA9PSAnbXA0JykgeworICAgICAg ICAgICAgICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IHZpZGVvL21wNCIpOworICAgICAgICAgICAg ICAgJGZpbGVOYW1lID0gInRlc3QubXA0IjsKKyAgICAgICAgfSBlbHNlIGlmICgkZXh0ZW5zaW9u ID09ICdvZ3YnKSB7CisgICAgICAgICAgICAgICBoZWFkZXIoIkNvbnRlbnQtVHlwZTogdmlkZW8v b2dnIik7CisgICAgICAgICAgICAgICAkZmlsZU5hbWUgPSAidGVzdC5vZ3YiOworICAgICAgICB9 IGVsc2UgaWYgKCRleHRlbnNpb24gPT0gJ3RzJykgeworICAgICAgICAgICAgICAgaGVhZGVyKCJD b250ZW50LVR5cGU6IHZpZGVvL21wZWd0cyIpOworICAgICAgICAgICAgICAgJGZpbGVOYW1lID0g Imhscy90ZXN0LnRzIjsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICBkaWU7CisKKyAg ICAgICAgaGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1zdG9yZSIpOworICAgICAgICBoZWFkZXIo IkNvbm5lY3Rpb246IGNsb3NlIik7CisKKyAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVOYW1lLCAi ciIpOworICAgICAgICBmcGFzc3RocnUoJGZuKTsKKyAgICAgICAgZmNsb3NlKCRmbik7CisgICAg ICAgIGV4aXQ7CisgICAgfQorPz4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMv bWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGguaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMGFhMGEw YTBlYjFjZjJlYmI2ZDljYjgxMzMyOTAwNzJhZDJkYzlmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC5odG1sCkBA IC0wLDAgKzEsMjkgQEAKKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InBy ZXBhcmVWaWRlbygpIj4KKzx2aWRlbyBpZD0idmlkZW8iPjwvdmlkZW8+Cis8c2NyaXB0IHNyYz0u Li8uLi9tZWRpYS1yZXNvdXJjZXMvdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKzxzY3JpcHQgc3Jj PS4uLy4uL21lZGlhLXJlc291cmNlcy9tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorPHNjcmlwdD4K KyAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNU ZXh0KCk7CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKworICAg IGZ1bmN0aW9uIHByZXBhcmVWaWRlbygpIHsKKyAgICAgICAgdmFyIG1vdmllID0gZmluZE1lZGlh RmlsZSgidmlkZW8iLCAicmVzb3VyY2VzL3Rlc3QiKTsKKyAgICAgICAgdmFyIHZpZGVvID0gZG9j dW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3ZpZGVvJyk7CisgICAgICAgIHZpZGVvLnNyYz0iaHR0cDov LzEyNy4wLjAuMTo4MDAwL21lZGlhL3Jlc291cmNlcy92aWRlby1uby1jb250ZW50LWxlbmd0aC5w aHA/dmlkZW89Iittb3ZpZTsKKyAgICAgICAgdmlkZW8ucGxheSgpOworICAgIH0KKworICAgIHdh aXRGb3JFdmVudCgiY2FucGxheSIsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgdGVzdEV4cGVjdGVk KCJ2aWRlby5kdXJhdGlvbiA9PSBJbmZpbml0eSIsIHRydWUpOworICAgICAgICBpZiAod2luZG93 LnRlc3RSdW5uZXIpCisgICAgICAgICAgICB3aW5kb3cudGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7 CisgICAgfSApOworPC9zY3JpcHQ+CitUZXN0cyB0aGF0IHZpZGVvcyB3aXRob3V0IENvbnRlbnQt TGVuZ3RoIGhlYWRlciBhcmUgY29uc2lkZXJlZCAibGl2ZSIgYW5kIHRoZXJlZm9yZSBoYXZlIGFu IGluZmluaXRlIGR1cmF0aW9uLjxici8+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50 LWxlbmd0aC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvaHR0cC90ZXN0 cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u NjBkNTk2YTczZmM4ZjkyNDhjNGEzYTg4ODIzNjBhNDk0NjIwMjI4OAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL3BsYXRmb3JtL2d0ay9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNv bnRlbnQtbGVuZ3RoLWV4cGVjdGVkLnR4dApAQCAtMCwwICsxLDUgQEAKKworRVZFTlQoY2FucGxh eSkKK0VYUEVDVEVEICh2aWRlby5kdXJhdGlvbiA9PSBJbmZpbml0eSA9PSAndHJ1ZScpIE9LCitU ZXN0cyB0aGF0IHZpZGVvcyB3aXRob3V0IENvbnRlbnQtTGVuZ3RoIGhlYWRlciBhcmUgY29uc2lk ZXJlZCAibGl2ZSIgYW5kIHRoZXJlZm9yZSBoYXZlIGFuIGluZmluaXRlIGR1cmF0aW9uLgorCg== 390656 2020-02-13 09:06:00 -0800 2020-02-13 09:48:18 -0800 Patch bug-205801-20200213170559.patch text/plain 7099 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkyZmYzNTcwNjczZjFj ODI1NGE3NDVkZWY3ZjZkMzVhZWU1NTZjZi4uODY5ODExODc2NGQxMzcyYzA2MTcxYmMxYzYzOTFi YTYwYWZkZTM0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTEzICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgcmVseSBv biByZXNwb25zZSBzaXplIHRvIHJlcGxhY2UgQ29udGVudC1MZW5ndGguIFRoaXMgbWF5IGJyZWFr IHN0cmVhbWluZyB2aWRlb3MsCisgICAgICAgIHdoaWNoIHNob3VsZCBhbHdheXMgaGF2ZSBhbiBJ bmZpbml0ZSBkdXJhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIHRoZSBm aXggZm91bmQgYnkgUGhpbGlwcGUgTm9ybWFuZCA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAg ICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLmh0bWwK KworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VH U3RyZWFtZXIuY3BwOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OmRh dGFSZWNlaXZlZCk6CisKIDIwMjAtMDItMDQgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUu Y29tPgogCiAgICAgICAgIENTUyBSdWxlcyB3aXRoIHRoZSBzYW1lIHNlbGVjdG9yIGZyb20gc2V2 ZXJhbCBsYXJnZSBzdHlsZXNoZWV0cyBhcmUgYXBwbGllZCBpbiB0aGUgd3Jvbmcgb3JkZXIKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJL aXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhp Y3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggMDYwZGY3MWJm Y2MyZGM2NzdiMjIwNmI4ZTA0ODA1YTc2NWUzMjIyMS4uYzI2MTk4NGM1MzQ2YjM3N2U3NTJhY2Y1 NDgwZjIzZTBmZGE1MjdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIvU291cmNl L1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJl YW1lci5jcHAKQEAgLTExNzEsMTAgKzExNzEsNiBAQCB2b2lkIENhY2hlZFJlc291cmNlU3RyZWFt aW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uc3QgYwog ICAgIGlmIChwcml2LT5oYXZlU2l6ZSAmJiAobmV3UG9zaXRpb24gPiBwcml2LT5zaXplKSkgewog ICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkdvdCBwb3NpdGlvbiBwcmV2aW91cyBlc3Rp bWF0ZWQgY29udGVudCBzaXplICglIiBHX0dJTlQ2NF9GT1JNQVQgIiA+ICUiIEdfR0lOVDY0X0ZP Uk1BVCAiKSIsIG5ld1Bvc2l0aW9uLCBwcml2LT5zaXplKTsKICAgICAgICAgbmV3U2l6ZSA9IG5l d1Bvc2l0aW9uOwotICAgIH0gZWxzZSBpZiAoIXByaXYtPmhhdmVTaXplKSB7Ci0gICAgICAgIEdT VF9ERUJVR19PQkpFQ1Qoc3JjLCAiR290IGluaXRpYWwgcmVzcG9uc2Ugd2l0aG91dCBDb250ZW50 LUxlbmd0aCwgYXNzdW1pbmcgcmVzcG9uc2Ugc2l6ZSBhcyBkdXJhdGlvbi4iKTsKLSAgICAgICAg bmV3U2l6ZSA9IGxlbmd0aDsKLSAgICAgICAgcHJpdi0+aGF2ZVNpemUgPSB0cnVlOwogICAgIH0K IAogICAgIGlmIChuZXdTaXplKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cg Yi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDgyOGE4NTAxNGViMWNjMmVkNDZkNTFkM2Nl NzcyMTMzM2RjODkwMC4uNzM0MmEzOGM2NzdjNmQwZGI4OGI2M2ZkNmRkYjljNWU4YTE2MDQwMCAx MDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5n ZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTEzICBFbnJpcXVlIE9jYcOxYSBHb256w6Fs ZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gU3RyZWFtaW5n IGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgU3BlY2lmeSBDb250ZW50LUxlbmd0aCB3aGVuIHBh c3NpbmcgbWVkaWEgZmlsZSB0aHJvdWdoLiBPdGhlcndpc2UgdGhlIEdTdHJlYW1lciBpbXBsZW1l bnRhdGlvbgorICAgICAgICBuZWVkcyB0byByZWx5IG9uIHJlc3BvbnNlIHNpemUgYW5kIHRoYXQg Y3JlYXRlcyBvdGhlciBpc3N1ZXMuIFRoaXMgc2hvdWxkbid0IGFmZmVjdCB0aGUgb3JpZ2luYWwK KyAgICAgICAgdGVzdCBwdXJwb3NlLCB3aGljaCBpcyB0byBjaGVjayBpZiBjb29raWVzIGFyZSBo b25vcmVkIHdoZW4gbG9hZGluZyB2aWRlbyBhc3NldHMuCisKKyAgICAgICAgKiBodHRwL3Rlc3Rz L21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hlY2stY29va2llLnBocDogU3BlY2lmeSBD b250ZW50LUxlbmd0aC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRl by1uby1jb250ZW50LWxlbmd0aC5waHA6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2h0dHAvdGVz dHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLWNvb2tpZS1jaGVjay1jb29raWUucGhwLgorICAgICAg ICBTaW1pbGFyIGZpbGUgcGFzc3Rocm91Z2ggYnV0IHVzaW5nIGEgR0VUIHBhcmFtZXRlciBpbnN0 ZWFkIG9mIGNvb2tpZXMgYW5kIG5vdCBzcGVjaWZ5aW5nIENvbnRlbnQtTGVuZ3RoLgorICAgICAg ICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGguaHRtbDogQWRkZWQu CisgICAgICAgICogcGxhdGZvcm0vZ3RrL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVu dC1sZW5ndGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAyMC0wMi0wNCAgQW50dGkgS29pdmlz dG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIFJ1bGVzIHdpdGggdGhlIHNhbWUg c2VsZWN0b3IgZnJvbSBzZXZlcmFsIGxhcmdlIHN0eWxlc2hlZXRzIGFyZSBhcHBsaWVkIGluIHRo ZSB3cm9uZyBvcmRlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9y ZXNvdXJjZXMvdmlkZW8tY29va2llLWNoZWNrLWNvb2tpZS5waHAgYi9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hlY2stY29va2llLnBocAppbmRl eCA0MmQ3NTBmNGM1NDJmYTgwMzYxMjhjNDVkMjRkOGVmOGNlZGZlMTc2Li44ZWVkNWY4Mjg0ZTJj ZDg0NmI0ZGUxMTdiNWRjMWNiODA4YTIyMzRmIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRw L3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hlY2stY29va2llLnBocAorKysg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hl Y2stY29va2llLnBocApAQCAtMTYsNiArMTYsNyBAQAogCiAgICAgICAgIGhlYWRlcigiQ2FjaGUt Q29udHJvbDogbm8tc3RvcmUiKTsKICAgICAgICAgaGVhZGVyKCJDb25uZWN0aW9uOiBjbG9zZSIp OworICAgICAgICBoZWFkZXIoIkNvbnRlbnQtTGVuZ3RoOiAiIC4gZmlsZXNpemUoJGZpbGVOYW1l KSk7CiAKICAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVOYW1lLCAiciIpOwogICAgICAgICBmcGFz c3RocnUoJGZuKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVz b3VyY2VzL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLnBocCBiL0xheW91dFRlc3RzL2h0dHAvdGVz dHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLnBocApuZXcgZmlsZSBt b2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw Li4zM2RlOWE0MzY1ODhiOTNkMTE0YWMzZmY4OGVlYTUzNGI2ODc5NGJjCi0tLSAvZGV2L251bGwK KysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJjZXMvdmlkZW8tbm8tY29u dGVudC1sZW5ndGgucGhwCkBAIC0wLDAgKzEsMjYgQEAKKzw/cGhwCisgICAgaWYoJF9HRVRbInZp ZGVvIl0pCisgICAgeworICAgICAgICAkdmlkZW9maWxlID0KKyAgICAgICAgJGV4dGVuc2lvbiA9 IHBhdGhpbmZvKCRfR0VUWyJ2aWRlbyJdLCBQQVRISU5GT19FWFRFTlNJT04pOworICAgICAgICBp ZiAoJGV4dGVuc2lvbiA9PSAnbXA0JykgeworICAgICAgICAgICAgICAgaGVhZGVyKCJDb250ZW50 LVR5cGU6IHZpZGVvL21wNCIpOworICAgICAgICAgICAgICAgJGZpbGVOYW1lID0gInRlc3QubXA0 IjsKKyAgICAgICAgfSBlbHNlIGlmICgkZXh0ZW5zaW9uID09ICdvZ3YnKSB7CisgICAgICAgICAg ICAgICBoZWFkZXIoIkNvbnRlbnQtVHlwZTogdmlkZW8vb2dnIik7CisgICAgICAgICAgICAgICAk ZmlsZU5hbWUgPSAidGVzdC5vZ3YiOworICAgICAgICB9IGVsc2UgaWYgKCRleHRlbnNpb24gPT0g J3RzJykgeworICAgICAgICAgICAgICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IHZpZGVvL21wZWd0 cyIpOworICAgICAgICAgICAgICAgJGZpbGVOYW1lID0gImhscy90ZXN0LnRzIjsKKyAgICAgICAg fSBlbHNlCisgICAgICAgICAgICAgICBkaWU7CisKKyAgICAgICAgaGVhZGVyKCJDYWNoZS1Db250 cm9sOiBuby1zdG9yZSIpOworICAgICAgICBoZWFkZXIoIkNvbm5lY3Rpb246IGNsb3NlIik7CisK KyAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVOYW1lLCAiciIpOworICAgICAgICBmcGFzc3RocnUo JGZuKTsKKyAgICAgICAgZmNsb3NlKCRmbik7CisgICAgICAgIGV4aXQ7CisgICAgfQorPz4KZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1s ZW5ndGguaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVu dC1sZW5ndGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4yMGFhMGEwYTBlYjFjZjJlYmI2ZDljYjgxMzMyOTAw NzJhZDJkYzlmCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRp YS92aWRlby1uby1jb250ZW50LWxlbmd0aC5odG1sCkBAIC0wLDAgKzEsMjkgQEAKKzxodG1sPgor PGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InByZXBhcmVWaWRlbygpIj4KKzx2aWRlbyBp ZD0idmlkZW8iPjwvdmlkZW8+Cis8c2NyaXB0IHNyYz0uLi8uLi9tZWRpYS1yZXNvdXJjZXMvdmlk ZW8tdGVzdC5qcz48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPS4uLy4uL21lZGlhLXJlc291cmNlcy9t ZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorPHNjcmlwdD4KKyAgICBpZiAod2luZG93LnRlc3RSdW5u ZXIpIHsKKyAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgIHRlc3RSdW5u ZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKworICAgIGZ1bmN0aW9uIHByZXBhcmVWaWRlbygp IHsKKyAgICAgICAgdmFyIG1vdmllID0gZmluZE1lZGlhRmlsZSgidmlkZW8iLCAicmVzb3VyY2Vz L3Rlc3QiKTsKKyAgICAgICAgdmFyIHZpZGVvID0gZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoJ3Zp ZGVvJyk7CisgICAgICAgIHZpZGVvLnNyYz0iaHR0cDovLzEyNy4wLjAuMTo4MDAwL21lZGlhL3Jl c291cmNlcy92aWRlby1uby1jb250ZW50LWxlbmd0aC5waHA/dmlkZW89Iittb3ZpZTsKKyAgICAg ICAgdmlkZW8ucGxheSgpOworICAgIH0KKworICAgIHdhaXRGb3JFdmVudCgiY2FucGxheSIsIGZ1 bmN0aW9uICgpIHsKKyAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5kdXJhdGlvbiA9PSBJbmZp bml0eSIsIHRydWUpOworICAgICAgICBpZiAod2luZG93LnRlc3RSdW5uZXIpCisgICAgICAgICAg ICB3aW5kb3cudGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgfSApOworPC9zY3JpcHQ+CitU ZXN0cyB0aGF0IHZpZGVvcyB3aXRob3V0IENvbnRlbnQtTGVuZ3RoIGhlYWRlciBhcmUgY29uc2lk ZXJlZCAibGl2ZSIgYW5kIHRoZXJlZm9yZSBoYXZlIGFuIGluZmluaXRlIGR1cmF0aW9uLjxici8+ Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsv aHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC1leHBlY3RlZC50eHQgYi9M YXlvdXRUZXN0cy9wbGF0Zm9ybS9ndGsvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50 LWxlbmd0aC1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uNjBkNTk2YTczZmM4ZjkyNDhjNGEzYTg4 ODIzNjBhNDk0NjIwMjI4OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL3BsYXRmb3Jt L2d0ay9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLWV4cGVjdGVkLnR4 dApAQCAtMCwwICsxLDUgQEAKKworRVZFTlQoY2FucGxheSkKK0VYUEVDVEVEICh2aWRlby5kdXJh dGlvbiA9PSBJbmZpbml0eSA9PSAndHJ1ZScpIE9LCitUZXN0cyB0aGF0IHZpZGVvcyB3aXRob3V0 IENvbnRlbnQtTGVuZ3RoIGhlYWRlciBhcmUgY29uc2lkZXJlZCAibGl2ZSIgYW5kIHRoZXJlZm9y ZSBoYXZlIGFuIGluZmluaXRlIGR1cmF0aW9uLgorCg== 390660 2020-02-13 09:48:22 -0800 2020-03-05 11:43:19 -0800 Patch bug-205801-20200213174821.patch text/plain 7101 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkyZmYzNTcwNjczZjFj ODI1NGE3NDVkZWY3ZjZkMzVhZWU1NTZjZi4uNDg0NzNlZjJiZmIwYzI5Yjc5NmFhZGFiOWNhZTVl YWI0MzAwZmU0NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTEzICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgWGFiaWVyIFJvZHJpZ3Vlei1DYWx2YXIuCisKKyAgICAgICAgRG9u J3QgcmVseSBvbiByZXNwb25zZSBzaXplIHRvIHJlcGxhY2UgQ29udGVudC1MZW5ndGguIFRoaXMg bWF5IGJyZWFrIHN0cmVhbWluZyB2aWRlb3MsCisgICAgICAgIHdoaWNoIHNob3VsZCBhbHdheXMg aGF2ZSBhbiBJbmZpbml0ZSBkdXJhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGJhc2Vk IG9uIHRoZSBmaXggZm91bmQgYnkgUGhpbGlwcGUgTm9ybWFuZCA8cG5vcm1hbmRAaWdhbGlhLmNv bT4KKworICAgICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVu Z3RoLmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdD bGllbnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMjAtMDItMDQgIEFudHRpIEtvaXZpc3RvICA8YW50 dGlAYXBwbGUuY29tPgogCiAgICAgICAgIENTUyBSdWxlcyB3aXRoIHRoZSBzYW1lIHNlbGVjdG9y IGZyb20gc2V2ZXJhbCBsYXJnZSBzdHlsZXNoZWV0cyBhcmUgYXBwbGllZCBpbiB0aGUgd3Jvbmcg b3JkZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJl YW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXgg MDYwZGY3MWJmY2MyZGM2NzdiMjIwNmI4ZTA0ODA1YTc2NWUzMjIyMS4uYzI2MTk4NGM1MzQ2YjM3 N2U3NTJhY2Y1NDgwZjIzZTBmZGE1MjdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxh dGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNv dXJjZUdTdHJlYW1lci5jcHAKQEAgLTExNzEsMTAgKzExNzEsNiBAQCB2b2lkIENhY2hlZFJlc291 cmNlU3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwg Y29uc3QgYwogICAgIGlmIChwcml2LT5oYXZlU2l6ZSAmJiAobmV3UG9zaXRpb24gPiBwcml2LT5z aXplKSkgewogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkdvdCBwb3NpdGlvbiBwcmV2 aW91cyBlc3RpbWF0ZWQgY29udGVudCBzaXplICglIiBHX0dJTlQ2NF9GT1JNQVQgIiA+ICUiIEdf R0lOVDY0X0ZPUk1BVCAiKSIsIG5ld1Bvc2l0aW9uLCBwcml2LT5zaXplKTsKICAgICAgICAgbmV3 U2l6ZSA9IG5ld1Bvc2l0aW9uOwotICAgIH0gZWxzZSBpZiAoIXByaXYtPmhhdmVTaXplKSB7Ci0g ICAgICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiR290IGluaXRpYWwgcmVzcG9uc2Ugd2l0aG91 dCBDb250ZW50LUxlbmd0aCwgYXNzdW1pbmcgcmVzcG9uc2Ugc2l6ZSBhcyBkdXJhdGlvbi4iKTsK LSAgICAgICAgbmV3U2l6ZSA9IGxlbmd0aDsKLSAgICAgICAgcHJpdi0+aGF2ZVNpemUgPSB0cnVl OwogICAgIH0KIAogICAgIGlmIChuZXdTaXplKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDgyOGE4NTAxNGViMWNjMmVk NDZkNTFkM2NlNzcyMTMzM2RjODkwMC4uOWFiNGRkNWI3MmYxNjgyNjFmOGI0YWIyNzczYjg2ZDc4 NjcxNWUxZCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRl c3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAyLTEzICBFbnJpcXVlIE9jYcOx YSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0g U3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgWGFiaWVyIFJvZHJpZ3Vlei1DYWx2YXIuCisKKyAgICAgICAgU3BlY2lmeSBDb250 ZW50LUxlbmd0aCB3aGVuIHBhc3NpbmcgbWVkaWEgZmlsZSB0aHJvdWdoLiBPdGhlcndpc2UgdGhl IEdTdHJlYW1lciBpbXBsZW1lbnRhdGlvbgorICAgICAgICBuZWVkcyB0byByZWx5IG9uIHJlc3Bv bnNlIHNpemUgYW5kIHRoYXQgY3JlYXRlcyBvdGhlciBpc3N1ZXMuIFRoaXMgc2hvdWxkbid0IGFm ZmVjdCB0aGUgb3JpZ2luYWwKKyAgICAgICAgdGVzdCBwdXJwb3NlLCB3aGljaCBpcyB0byBjaGVj ayBpZiBjb29raWVzIGFyZSBob25vcmVkIHdoZW4gbG9hZGluZyB2aWRlbyBhc3NldHMuCisKKyAg ICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hlY2stY29v a2llLnBocDogU3BlY2lmeSBDb250ZW50LUxlbmd0aC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL21l ZGlhL3Jlc291cmNlcy92aWRlby1uby1jb250ZW50LWxlbmd0aC5waHA6IENvcGllZCBmcm9tIExh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLWNvb2tpZS1jaGVjay1j b29raWUucGhwLgorICAgICAgICBTaW1pbGFyIGZpbGUgcGFzc3Rocm91Z2ggYnV0IHVzaW5nIGEg R0VUIHBhcmFtZXRlciBpbnN0ZWFkIG9mIGNvb2tpZXMgYW5kIG5vdCBzcGVjaWZ5aW5nIENvbnRl bnQtTGVuZ3RoLgorICAgICAgICAqIGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1s ZW5ndGguaHRtbDogQWRkZWQuCisgICAgICAgICogcGxhdGZvcm0vZ3RrL2h0dHAvdGVzdHMvbWVk aWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGgtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKwogMjAyMC0w Mi0wNCAgQW50dGkgS29pdmlzdG8gIDxhbnR0aUBhcHBsZS5jb20+CiAKICAgICAgICAgQ1NTIFJ1 bGVzIHdpdGggdGhlIHNhbWUgc2VsZWN0b3IgZnJvbSBzZXZlcmFsIGxhcmdlIHN0eWxlc2hlZXRz IGFyZSBhcHBsaWVkIGluIHRoZSB3cm9uZyBvcmRlcgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJjZXMvdmlkZW8tY29va2llLWNoZWNrLWNvb2tpZS5waHAg Yi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hl Y2stY29va2llLnBocAppbmRleCA0MmQ3NTBmNGM1NDJmYTgwMzYxMjhjNDVkMjRkOGVmOGNlZGZl MTc2Li44ZWVkNWY4Mjg0ZTJjZDg0NmI0ZGUxMTdiNWRjMWNiODA4YTIyMzRmIDEwMDY0NAotLS0g YS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNlcy92aWRlby1jb29raWUtY2hl Y2stY29va2llLnBocAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291cmNl cy92aWRlby1jb29raWUtY2hlY2stY29va2llLnBocApAQCAtMTYsNiArMTYsNyBAQAogCiAgICAg ICAgIGhlYWRlcigiQ2FjaGUtQ29udHJvbDogbm8tc3RvcmUiKTsKICAgICAgICAgaGVhZGVyKCJD b25uZWN0aW9uOiBjbG9zZSIpOworICAgICAgICBoZWFkZXIoIkNvbnRlbnQtTGVuZ3RoOiAiIC4g ZmlsZXNpemUoJGZpbGVOYW1lKSk7CiAKICAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVOYW1lLCAi ciIpOwogICAgICAgICBmcGFzc3RocnUoJGZuKTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLnBocCBiL0xh eW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3ZpZGVvLW5vLWNvbnRlbnQtbGVu Z3RoLnBocApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi4zM2RlOWE0MzY1ODhiOTNkMTE0YWMzZmY4OGVlYTUzNGI2ODc5 NGJjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9yZXNv dXJjZXMvdmlkZW8tbm8tY29udGVudC1sZW5ndGgucGhwCkBAIC0wLDAgKzEsMjYgQEAKKzw/cGhw CisgICAgaWYoJF9HRVRbInZpZGVvIl0pCisgICAgeworICAgICAgICAkdmlkZW9maWxlID0KKyAg ICAgICAgJGV4dGVuc2lvbiA9IHBhdGhpbmZvKCRfR0VUWyJ2aWRlbyJdLCBQQVRISU5GT19FWFRF TlNJT04pOworICAgICAgICBpZiAoJGV4dGVuc2lvbiA9PSAnbXA0JykgeworICAgICAgICAgICAg ICAgaGVhZGVyKCJDb250ZW50LVR5cGU6IHZpZGVvL21wNCIpOworICAgICAgICAgICAgICAgJGZp bGVOYW1lID0gInRlc3QubXA0IjsKKyAgICAgICAgfSBlbHNlIGlmICgkZXh0ZW5zaW9uID09ICdv Z3YnKSB7CisgICAgICAgICAgICAgICBoZWFkZXIoIkNvbnRlbnQtVHlwZTogdmlkZW8vb2dnIik7 CisgICAgICAgICAgICAgICAkZmlsZU5hbWUgPSAidGVzdC5vZ3YiOworICAgICAgICB9IGVsc2Ug aWYgKCRleHRlbnNpb24gPT0gJ3RzJykgeworICAgICAgICAgICAgICAgaGVhZGVyKCJDb250ZW50 LVR5cGU6IHZpZGVvL21wZWd0cyIpOworICAgICAgICAgICAgICAgJGZpbGVOYW1lID0gImhscy90 ZXN0LnRzIjsKKyAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICBkaWU7CisKKyAgICAgICAg aGVhZGVyKCJDYWNoZS1Db250cm9sOiBuby1zdG9yZSIpOworICAgICAgICBoZWFkZXIoIkNvbm5l Y3Rpb246IGNsb3NlIik7CisKKyAgICAgICAgJGZuID0gZm9wZW4oJGZpbGVOYW1lLCAiciIpOwor ICAgICAgICBmcGFzc3RocnUoJGZuKTsKKyAgICAgICAgZmNsb3NlKCRmbik7CisgICAgICAgIGV4 aXQ7CisgICAgfQorPz4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEv dmlkZW8tbm8tY29udGVudC1sZW5ndGguaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVk aWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGguaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRl eCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kOTVlOGZkMjdkY2Ji NWIyZjE3YjZmYTY2OTI4NzMzZTc5NDczZTRjCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVz dHMvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC5odG1sCkBAIC0wLDAg KzEsMjkgQEAKKzxodG1sPgorPGhlYWQ+Cis8L2hlYWQ+Cis8Ym9keSBvbmxvYWQ9InByZXBhcmVW aWRlbygpIj4KKzx2aWRlbyBpZD0idmlkZW8iPjwvdmlkZW8+Cis8c2NyaXB0IHNyYz0uLi8uLi9t ZWRpYS1yZXNvdXJjZXMvdmlkZW8tdGVzdC5qcz48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPS4uLy4u L21lZGlhLXJlc291cmNlcy9tZWRpYS1maWxlLmpzPjwvc2NyaXB0PgorPHNjcmlwdD4KKyAgICBp ZiAod2luZG93LnRlc3RSdW5uZXIpIHsKKyAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7 CisgICAgICAgIHRlc3RSdW5uZXIud2FpdFVudGlsRG9uZSgpOworICAgIH0KKworICAgIGZ1bmN0 aW9uIHByZXBhcmVWaWRlbygpIHsKKyAgICAgICAgdmFyIG1vdmllID0gZmluZE1lZGlhRmlsZSgi dmlkZW8iLCAicmVzb3VyY2VzL3Rlc3QiKTsKKyAgICAgICAgdmFyIHZpZGVvID0gZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoJ3ZpZGVvJyk7CisgICAgICAgIHZpZGVvLnNyYz0iaHR0cDovLzEyNy4w LjAuMTo4MDAwL21lZGlhL3Jlc291cmNlcy92aWRlby1uby1jb250ZW50LWxlbmd0aC5waHA/dmlk ZW89Iittb3ZpZTsKKyAgICAgICAgdmlkZW8ucGxheSgpOworICAgIH0KKworICAgIHdhaXRGb3JF dmVudCgiY2FucGxheSIsIGZ1bmN0aW9uICgpIHsKKyAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRl by5kdXJhdGlvbiIsIEluZmluaXR5KTsKKyAgICAgICAgaWYgKHdpbmRvdy50ZXN0UnVubmVyKQor ICAgICAgICAgICAgd2luZG93LnRlc3RSdW5uZXIubm90aWZ5RG9uZSgpOworICAgIH0gKTsKKzwv c2NyaXB0PgorVGVzdHMgdGhhdCB2aWRlb3Mgd2l0aG91dCBDb250ZW50LUxlbmd0aCBoZWFkZXIg YXJlIGNvbnNpZGVyZWQgImxpdmUiIGFuZCB0aGVyZWZvcmUgaGF2ZSBhbiBpbmZpbml0ZSBkdXJh dGlvbi48YnIvPgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvcGxh dGZvcm0vZ3RrL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGgtZXhwZWN0 ZWQudHh0IGIvTGF5b3V0VGVzdHMvcGxhdGZvcm0vZ3RrL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8t bm8tY29udGVudC1sZW5ndGgtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4 IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjgwMjYxZGFiNTNlMDEz ZGViNGRkNTcxNTZmMjVjZjE5ZDdkZmZhYzIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0 cy9wbGF0Zm9ybS9ndGsvaHR0cC90ZXN0cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC1l eHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACisKK0VWRU5UKGNhbnBsYXkpCitFWFBFQ1RFRCAo dmlkZW8uZHVyYXRpb24gPT0gJ0luZmluaXR5JykgT0sKK1Rlc3RzIHRoYXQgdmlkZW9zIHdpdGhv dXQgQ29udGVudC1MZW5ndGggaGVhZGVyIGFyZSBjb25zaWRlcmVkICJsaXZlIiBhbmQgdGhlcmVm b3JlIGhhdmUgYW4gaW5maW5pdGUgZHVyYXRpb24uCisK 392604 2020-03-05 11:43:23 -0800 2020-03-06 04:41:31 -0800 Patch bug-205801-20200305194322.patch text/plain 6863 eocanha U3VidmVyc2lvbiBSZXZpc2lvbjogMjU1NjcxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNDkyZmYzNTcwNjczZjFj ODI1NGE3NDVkZWY3ZjZkMzVhZWU1NTZjZi4uZDk5YzkwODY0MmFhOGI5NWRlZWQwMGY0ZmZlZDNm NWMwZGI3ZTNhZCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTA1ICBFbnJp cXVlIE9jYcOxYSBHb256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dT dHJlYW1lcl0gU3RyZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG9uJ3QgcmVseSBv biByZXNwb25zZSBzaXplIHRvIHJlcGxhY2UgQ29udGVudC1MZW5ndGguIFRoaXMgbWF5IGJyZWFr IHN0cmVhbWluZyB2aWRlb3MsCisgICAgICAgIHdoaWNoIHNob3VsZCBhbHdheXMgaGF2ZSBhbiBJ bmZpbml0ZSBkdXJhdGlvbi4KKworICAgICAgICBUaGlzIHBhdGNoIGlzIGJhc2VkIG9uIHRoZSBm aXggZm91bmQgYnkgUGhpbGlwcGUgTm9ybWFuZCA8cG5vcm1hbmRAaWdhbGlhLmNvbT4KKworICAg ICAgICBUZXN0OiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLXN0YWxs Lmh0bWwKKworICAgICAgICAqIHBsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJT b3VyY2VHU3RyZWFtZXIuY3BwOgorICAgICAgICAoQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGll bnQ6OmRhdGFSZWNlaXZlZCk6CisKIDIwMjAtMDItMDQgIEFudHRpIEtvaXZpc3RvICA8YW50dGlA YXBwbGUuY29tPgogCiAgICAgICAgIENTUyBSdWxlcyB3aXRoIHRoZSBzYW1lIHNlbGVjdG9yIGZy b20gc2V2ZXJhbCBsYXJnZSBzdHlsZXNoZWV0cyBhcmUgYXBwbGllZCBpbiB0aGUgd3Jvbmcgb3Jk ZXIKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1l ci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0v Z3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKaW5kZXggMDYw ZGY3MWJmY2MyZGM2NzdiMjIwNmI4ZTA0ODA1YTc2NWUzMjIyMS4uYzI2MTk4NGM1MzQ2YjM3N2U3 NTJhY2Y1NDgwZjIzZTBmZGE1MjdkOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL1dlYktpdFdlYlNvdXJj ZUdTdHJlYW1lci5jcHAKQEAgLTExNzEsMTAgKzExNzEsNiBAQCB2b2lkIENhY2hlZFJlc291cmNl U3RyZWFtaW5nQ2xpZW50OjpkYXRhUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29u c3QgYwogICAgIGlmIChwcml2LT5oYXZlU2l6ZSAmJiAobmV3UG9zaXRpb24gPiBwcml2LT5zaXpl KSkgewogICAgICAgICBHU1RfREVCVUdfT0JKRUNUKHNyYywgIkdvdCBwb3NpdGlvbiBwcmV2aW91 cyBlc3RpbWF0ZWQgY29udGVudCBzaXplICglIiBHX0dJTlQ2NF9GT1JNQVQgIiA+ICUiIEdfR0lO VDY0X0ZPUk1BVCAiKSIsIG5ld1Bvc2l0aW9uLCBwcml2LT5zaXplKTsKICAgICAgICAgbmV3U2l6 ZSA9IG5ld1Bvc2l0aW9uOwotICAgIH0gZWxzZSBpZiAoIXByaXYtPmhhdmVTaXplKSB7Ci0gICAg ICAgIEdTVF9ERUJVR19PQkpFQ1Qoc3JjLCAiR290IGluaXRpYWwgcmVzcG9uc2Ugd2l0aG91dCBD b250ZW50LUxlbmd0aCwgYXNzdW1pbmcgcmVzcG9uc2Ugc2l6ZSBhcyBkdXJhdGlvbi4iKTsKLSAg ICAgICAgbmV3U2l6ZSA9IGxlbmd0aDsKLSAgICAgICAgcHJpdi0+aGF2ZVNpemUgPSB0cnVlOwog ICAgIH0KIAogICAgIGlmIChuZXdTaXplKSB7CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKaW5kZXggZDgyOGE4NTAxNGViMWNjMmVkNDZk NTFkM2NlNzcyMTMzM2RjODkwMC4uNTYwYzU3ZDYwZDUxMGI4MTQ0MDAzYWY1MTFkMmU0ZWZkM2Y2 OTcxOSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3Rz L0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTAzLTA1ICBFbnJpcXVlIE9jYcOxYSBH b256w6FsZXogIDxlb2NhbmhhQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dTdHJlYW1lcl0gU3Ry ZWFtaW5nIGFhYy9tcDMgYXVkaW8gZG9lc24ndCBhbHdheXMgd29yaworICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjA1ODAxCisKKyAgICAgICAgUmV2aWV3 ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIG5ldyB0ZXN0IGNoZWNrcyB0aGF0 IGVuZC1vZi1zdHJlYW0gKHRodXMsIGVuZCBvZiBwbGF5YmFjaykgaXNuJ3QgdHJpZ2dlcmVkIHdo ZW4gYSBsaXZlCisgICAgICAgIGF1ZGlvIHN0cmVhbSBpcyBiZWluZyBwbGF5ZWQuIExpdmUgc3Ry ZWFtcyBkb24ndCBoYXZlIENvbnRlbnQtTGVuZ3RoIGFuZCBhcmUgbG9hZGVkIGFzCisgICAgICAg IHRoZXkgYXJlIGdlbmVyYXRlZCAobm8gZnV0dXJlIGRhdGEgaXMgYXZhaWxhYmxlIGltbWVkaWF0 ZWx5KS4gVGhpcyBpcyBzaW11bGF0ZWQgYnkgb21pdHRpbmcKKyAgICAgICAgQ29udGVudC1MZW5n dGggYW5kIGFydGlmaWNpYWxseSBzdGFsbGluZyB0aGUgc3RyZWFtIGF0IGEgZ2l2ZW4gb2Zmc2V0 LgorCisgICAgICAgICogaHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJjZXMvc2VydmUtdmlkZW8ucGhw OiBOb3cgdGhlIGZpbGUgY29udGludWVzIHRvIGJlIHNlcnZlZCBhZnRlcgorICAgICAgICB0aGUg c3RhbGwgd2hlbiBzdGFsbE9mZnNldC9zdGFsbER1cmF0aW9uIGFyZSB1c2VkLgorICAgICAgICAq IGh0dHAvdGVzdHMvbWVkaWEvdmlkZW8tbm8tY29udGVudC1sZW5ndGgtc3RhbGwtZXhwZWN0ZWQu dHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQt bGVuZ3RoLXN0YWxsLmh0bWw6IEFkZGVkLgorCiAyMDIwLTAyLTA0ICBBbnR0aSBLb2l2aXN0byAg PGFudHRpQGFwcGxlLmNvbT4KIAogICAgICAgICBDU1MgUnVsZXMgd2l0aCB0aGUgc2FtZSBzZWxl Y3RvciBmcm9tIHNldmVyYWwgbGFyZ2Ugc3R5bGVzaGVldHMgYXJlIGFwcGxpZWQgaW4gdGhlIHdy b25nIG9yZGVyCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291 cmNlcy9zZXJ2ZS12aWRlby5waHAgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3Jlc291 cmNlcy9zZXJ2ZS12aWRlby5waHAKaW5kZXggMjM1MjI2YWU4NWI4NjA2ZjBiMmI0YWRjZmE4OTc1 ODU3NmVhMGVkOC4uMmI5MmM1MWQ4NzlmZDFlOWRkNDJkOTgxMGU5NjM2NTUxMTQxNWI3ZSAxMDA2 NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS9yZXNvdXJjZXMvc2VydmUtdmlk ZW8ucGhwCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvcmVzb3VyY2VzL3NlcnZl LXZpZGVvLnBocApAQCAtMTQ0LDIxICsxNDQsMjYgQEAgYW5zd2VyaW5nOgogICAgIGlmICgkc2V0 dGluZ3NbInN0YWxsRHVyYXRpb24iXSkKICAgICAgICAgc2V0X3RpbWVfbGltaXQoMCk7CiAKKyAg ICAkc3RhbGxlZE9uY2UgPSBmYWxzZTsKICAgICB3aGlsZSAoIWZlb2YoJGZuKSAmJiAkb2Zmc2V0 IDw9ICRlbmQgJiYgY29ubmVjdGlvbl9zdGF0dXMoKSA9PSAwKSB7CiAgICAgICAgICRyZWFkU2l6 ZSA9IG1pbigkc2V0dGluZ3NbImNodW5rU2l6ZSJdLCAoJGVuZCAtICRvZmZzZXQpICsgMSk7CiAg ICAgICAgICRzdGFsbE5vdyA9IGZhbHNlOwotICAgICAgICBpZiAoJHNldHRpbmdzWyJzdGFsbE9m ZnNldCJdICYmICRzZXR0aW5nc1sic3RhbGxPZmZzZXQiXSA+PSAkb2Zmc2V0ICYmICRzZXR0aW5n c1sic3RhbGxPZmZzZXQiXSA8ICRvZmZzZXQgKyAkcmVhZFNpemUpIHsKKyAgICAgICAgaWYgKCEk c3RhbGxlZE9uY2UgJiYgJHNldHRpbmdzWyJzdGFsbE9mZnNldCJdICYmICRzZXR0aW5nc1sic3Rh bGxPZmZzZXQiXSA+PSAkb2Zmc2V0ICYmICRzZXR0aW5nc1sic3RhbGxPZmZzZXQiXSA8ICRvZmZz ZXQgKyAkcmVhZFNpemUpIHsKICAgICAgICAgICAgICRyZWFkU2l6ZSA9IG1pbigkc2V0dGluZ3Nb ImNodW5rU2l6ZSJdLCAkc2V0dGluZ3NbInN0YWxsT2Zmc2V0Il0gLSAkb2Zmc2V0KTsKICAgICAg ICAgICAgICRzdGFsbE5vdyA9IHRydWU7CiAgICAgICAgIH0KIAogICAgICAgICAkYnVmZmVyID0g ZnJlYWQoJGZuLCAkcmVhZFNpemUpOworICAgICAgICAkcmVhZExlbmd0aCA9IHN0cmxlbigkYnVm ZmVyKTsKKwogICAgICAgICBwcmludCgkYnVmZmVyKTsKICAgICAgICAgZmx1c2goKTsKLSAgICAg ICAgJG9mZnNldCArPSAkc2V0dGluZ3NbImNodW5rU2l6ZSJdOworICAgICAgICAkb2Zmc2V0ICs9 ICRyZWFkTGVuZ3RoOwogICAgICAgICAKLSAgICAgICAgaWYgKCRzdGFsbE5vdykKKyAgICAgICAg aWYgKCRzdGFsbE5vdykgewogICAgICAgICAgICAgc2xlZXAoJHNldHRpbmdzWyJzdGFsbER1cmF0 aW9uIl0pOworICAgICAgICAgICAgJHN0YWxsZWRPbmNlID0gdHJ1ZTsKKyAgICAgICAgfQogICAg IH0KICAgICBmY2xvc2UoJGZuKTsKIApkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9tZWRpYS92aWRlby1uby1jb250ZW50LWxlbmd0aC1zdGFsbC1leHBlY3RlZC50eHQgYi9MYXlv dXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLXN0YWxsLWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi44MDc4Y2JkNzM5MzA3ZGU0MDE2MDI0MzBlZjY4NDQxMzhk OGI0MTJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9tZWRpYS92 aWRlby1uby1jb250ZW50LWxlbmd0aC1zdGFsbC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBA CitMaXZlIGF1ZGlvcyAobm8gQ29udGVudC1MZW5ndGgsIGxvYWRlZCBhcyB0aGV5IGFyZSBnZW5l cmF0ZWQpIHNob3VsZG4ndCB0cmlnZ2VyIGVuZC1vZi1zdHJlYW0gaWYgZnV0dXJlIGRhdGEgaXNu J3QgYXZhaWxhYmxlIGltbWVkaWF0ZWx5LgorCitFVkVOVChlbmRlZCkKK0VYUEVDVEVEICh2aWRl by5jdXJyZW50VGltZSA+IDYgPT0gJ3RydWUnKSBPSworCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0 cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLXN0YWxsLmh0bWwgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL21lZGlhL3ZpZGVvLW5vLWNvbnRlbnQtbGVuZ3RoLXN0YWxs Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uZmJlZmU4OTg3ZWIwNzYzMmFkNTNhOWIyZWFjN2Q5NjdlYjMxZWE1 MwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvbWVkaWEvdmlkZW8t bm8tY29udGVudC1sZW5ndGgtc3RhbGwuaHRtbApAQCAtMCwwICsxLDMwIEBACis8aHRtbD4KKzxo ZWFkPgorICAgIDxzY3JpcHQgc3JjPS4uLy4uL21lZGlhLXJlc291cmNlcy92aWRlby10ZXN0Lmpz Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikg eworICAgICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgICAgICAgICAgICB0ZXN0 UnVubmVyLndhaXRVbnRpbERvbmUoKTsKKyAgICAgICAgfQorCisgICAgICAgIGZ1bmN0aW9uIHBy ZXBhcmVBdWRpbygpIHsKKyAgICAgICAgICAgIC8vIEdsb2JhbCB2YXJpYWJsZXMgdXNlZCBmcm9t IHZpZGVvLXRlc3QuanMuCisgICAgICAgICAgICB2aWRlbyA9IGRvY3VtZW50LmdldEVsZW1lbnRC eUlkKCdhdWRpbycpOworICAgICAgICAgICAgdmlkZW8uc3JjPSJodHRwOi8vMTI3LjAuMC4xOjgw MDAvbWVkaWEvcmVzb3VyY2VzL3NlcnZlLXZpZGVvLnBocD9jb250ZW50LWxlbmd0aD1ubyIKKyAg ICAgICAgICAgICAgICArICImbmFtZT1obHMvZW5nbGlzaC9kZXNjcmlwdGlvbi5hYWMmdHlwZT1h dWRpby9hYWMmc3RhbGxPZmZzZXQ9NTEyJnN0YWxsRHVyYXRpb249MiI7CisgICAgICAgICAgICBt ZWRpYUVsZW1lbnQgPSB2aWRlbzsKKyAgICAgICAgICAgIHZpZGVvLnBsYXkoKTsKKyAgICAgICAg fQorCisgICAgICAgIHdhaXRGb3JFdmVudCgiZW5kZWQiLCBmdW5jdGlvbiBvbkVuZGVkKCkgewor ICAgICAgICAgICAgdGVzdEV4cGVjdGVkKCJ2aWRlby5jdXJyZW50VGltZSA+IDYiLCB0cnVlKTsK KyAgICAgICAgICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKKyAgICAgICAgICAgICAgICB3aW5k b3cudGVzdFJ1bm5lci5ub3RpZnlEb25lKCk7CisgICAgICAgIH0pOworICAgIDwvc2NyaXB0Pgor PC9oZWFkPgorPGJvZHkgb25sb2FkPSJwcmVwYXJlQXVkaW8oKSI+CitMaXZlIGF1ZGlvcyAobm8g Q29udGVudC1MZW5ndGgsIGxvYWRlZCBhcyB0aGV5IGFyZSBnZW5lcmF0ZWQpIHNob3VsZG4ndCB0 cmlnZ2VyIGVuZC1vZi1zdHJlYW0gaWYgZnV0dXJlIGRhdGEgaXNuJ3QgYXZhaWxhYmxlIGltbWVk aWF0ZWx5Ljxici8+Cis8YXVkaW8gY29udHJvbHMgaWQ9ImF1ZGlvIiBwbGF5c2lubGluZT48L2F1 ZGlvPgorPC9ib2R5PgorPC9odG1sPgo=