180659 2017-12-11 10:12:14 -0800 Layout Test http/tests/workers/service/postmessage-after-sw-process-crash.https.html is flaky 2017-12-11 14:50:49 -0800 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=180477 InRadar P2 Normal --- 1 ryanhaddad cdumez beidson cdumez commit-queue ggaren webkit-bug-importer youennf oldest_to_newest 1380277 0 ryanhaddad 2017-12-11 10:12:14 -0800 The following layout test is flaky on macOS and iOS WK2: http/tests/workers/service/postmessage-after-sw-process-crash.https.html Probable cause: Test was added with https://trac.webkit.org/changeset/225622/webkit Flakiness Dashboard: https://webkit-test-results.webkit.org/dashboards/flakiness_dashboard.html#showAllRuns=true&tests=http%2Ftests%2Fworkers%2Fservice%2Fpostmessage-after-sw-process-crash.https.html --- /Volumes/Data/slave/elcapitan-release-tests-wk2/build/layout-test-results/http/tests/workers/service/postmessage-after-sw-process-crash.https-expected.txt +++ /Volumes/Data/slave/elcapitan-release-tests-wk2/build/layout-test-results/http/tests/workers/service/postmessage-after-sw-process-crash.https-actual.txt @@ -3,6 +3,5 @@ PASS: Service worker received message 'Message 1' from origin 'https://127.0.0.1:8443' * Simulating Service Worker process crash * Sending 'Message 2' to Service Worker -PASS: Client received message from service worker, origin: https://127.0.0.1:8443 -PASS: Service worker received message 'Message 2' from origin 'https://127.0.0.1:8443' +FAIL: Did not receive message from service worker process after the crash 1380288 1 cdumez 2017-12-11 10:32:16 -0800 Will take a look. 1380375 2 329027 cdumez 2017-12-11 13:43:36 -0800 Created attachment 329027 Patch 1380387 3 329027 youennf 2017-12-11 14:03:40 -0800 Comment on attachment 329027 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=329027&action=review > Source/WebKit/StorageProcess/ServiceWorker/WebSWServerConnection.cpp:133 > + server().runServiceWorkerIfNecessary(destinationIdentifier, [destinationIdentifier, message = message.vector(), sourceIdentifier, sourceData = WTFMove(sourceData)](bool success, auto& contextConnection) mutable { No need for message to be passed as an r value. This is so easy to fall into the trap of copying a DataReference and thinking that it will copy the data it refers to. Maybe DataReference should not be copy constructible, one can still explicitly create a DataReference with one of its other constructor. > LayoutTests/http/tests/workers/service/resources/postmessage-after-sw-process-crash.js:18 > + }, 10); For that kind of pattern, I usually like to do this ping for a number of time and fail afterwards with an explicit message. This allows making test messages in case of timeouts more precise. 1380391 4 329034 cdumez 2017-12-11 14:16:06 -0800 Created attachment 329034 Patch 1380401 5 329034 commit-queue 2017-12-11 14:49:13 -0800 Comment on attachment 329034 Patch Clearing flags on attachment: 329034 Committed r225758: <https://trac.webkit.org/changeset/225758> 1380402 6 commit-queue 2017-12-11 14:49:15 -0800 All reviewed patches have been landed. Closing bug. 1380403 7 webkit-bug-importer 2017-12-11 14:50:49 -0800 <rdar://problem/35979040> 329027 2017-12-11 13:43:36 -0800 2017-12-11 14:16:05 -0800 Patch bug-180659-20171211134335.patch text/plain 8658 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2MGQ2NmE1ZTYwZjhlM2Zh MGM3NjdmZDUyM2M0ZWE4MWQ4NTM2YzMuLmE4NjA2ZTBkNjFmY2U0YzVkY2NlZTUwNDk1YzZkOTBj ODE0MDNkNzQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMTItMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBodHRwL3Rlc3Rz L3dvcmtlcnMvc2VydmljZS9wb3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLmh0dHBz Lmh0bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4MDY1OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEZpeCBmbGFreSBjcmFzaCBkdWUgdG8gY2FwdHVyaW5nIGFuIElQQzo6RGF0YVJlZmVy ZW5jZSBpbiBhIGxhbWJkYSwgd2hpY2ggd291bGQgcG9pbnQgdG8gaW52YWxpZAorICAgICAgICBt ZW1vcnkgd2hlbiB0aGUgbGFtYmRhIGlzIGNhbGxlZCBhc3luY2hyb25vdXNseS4KKworICAgICAg ICAqIFN0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNw cDoKKyAgICAgICAgKFdlYktpdDo6V2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpwb3N0TWVzc2FnZVRv U2VydmljZVdvcmtlckZyb21DbGllbnQpOgorICAgICAgICAoV2ViS2l0OjpXZWJTV1NlcnZlckNv bm5lY3Rpb246OnBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyRnJvbVNlcnZpY2VXb3JrZXIpOgor CiAyMDE3LTEyLTExICBEYXZpZCBRdWVzYWRhICA8ZGF2aWRfcXVlc2FkYUBhcHBsZS5jb20+CiAK ICAgICAgICAgVHVybiBvbiBFTkFCTEVfQVBQTElDQVRJT05fTUFOSUZFU1QKZGlmZiAtLWdpdCBh L1NvdXJjZS9XZWJLaXQvU3RvcmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNv bm5lY3Rpb24uY3BwIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2Vy L1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAKaW5kZXggNzQ4MTFmNDc5ZWZkYjA4MWZiYThmMjlm ZjBkZjk0Y2JiM2MyM2MwNi4uOTBjOTdiM2QyMTliZWU0YmI5YWEyYjJiMzViMjdiYmYzMjY3Mzhj NyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2Vy L1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9TdG9yYWdlUHJv Y2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAKQEAgLTEzMCw3ICsx MzAsNyBAQCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaCh1aW50NjRfdCBm ZXRjaElkZW50aWZpZXIsIFNlcnZpY2VXb3JrZXJJZAogdm9pZCBXZWJTV1NlcnZlckNvbm5lY3Rp b246OnBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyRnJvbUNsaWVudChTZXJ2aWNlV29ya2VySWRl bnRpZmllciBkZXN0aW5hdGlvbklkZW50aWZpZXIsIElQQzo6RGF0YVJlZmVyZW5jZSYmIG1lc3Nh Z2UsIFNlcnZpY2VXb3JrZXJDbGllbnRJZGVudGlmaWVyIHNvdXJjZUlkZW50aWZpZXIsIFNlcnZp Y2VXb3JrZXJDbGllbnREYXRhJiYgc291cmNlRGF0YSkKIHsKICAgICAvLyBJdCdzIHBvc3NpYmxl IHRoaXMgc3BlY2lmaWMgd29ya2VyIGNhbm5vdCBiZSByZS1ydW4gKGUuZy4gaXRzIHJlZ2lzdHJh dGlvbiBoYXMgYmVlbiByZW1vdmVkKQotICAgIHNlcnZlcigpLnJ1blNlcnZpY2VXb3JrZXJJZk5l Y2Vzc2FyeShkZXN0aW5hdGlvbklkZW50aWZpZXIsIFtkZXN0aW5hdGlvbklkZW50aWZpZXIsIG1l c3NhZ2UgPSBXVEZNb3ZlKG1lc3NhZ2UpLCBzb3VyY2VJZGVudGlmaWVyLCBzb3VyY2VEYXRhID0g V1RGTW92ZShzb3VyY2VEYXRhKV0oYm9vbCBzdWNjZXNzLCBhdXRvJiBjb250ZXh0Q29ubmVjdGlv bikgbXV0YWJsZSB7CisgICAgc2VydmVyKCkucnVuU2VydmljZVdvcmtlcklmTmVjZXNzYXJ5KGRl c3RpbmF0aW9uSWRlbnRpZmllciwgW2Rlc3RpbmF0aW9uSWRlbnRpZmllciwgbWVzc2FnZSA9IG1l c3NhZ2UudmVjdG9yKCksIHNvdXJjZUlkZW50aWZpZXIsIHNvdXJjZURhdGEgPSBXVEZNb3ZlKHNv dXJjZURhdGEpXShib29sIHN1Y2Nlc3MsIGF1dG8mIGNvbnRleHRDb25uZWN0aW9uKSBtdXRhYmxl IHsKICAgICAgICAgaWYgKHN1Y2Nlc3MpCiAgICAgICAgICAgICBzZW5kVG9Db250ZXh0UHJvY2Vz cyhjb250ZXh0Q29ubmVjdGlvbiwgTWVzc2FnZXM6OldlYlNXQ29udGV4dE1hbmFnZXJDb25uZWN0 aW9uOjpQb3N0TWVzc2FnZVRvU2VydmljZVdvcmtlckZyb21DbGllbnQgeyBkZXN0aW5hdGlvbklk ZW50aWZpZXIsIG1lc3NhZ2UsIHNvdXJjZUlkZW50aWZpZXIsIFdURk1vdmUoc291cmNlRGF0YSkg fSk7CiAgICAgfSk7CkBAIC0xNDMsNyArMTQzLDcgQEAgdm9pZCBXZWJTV1NlcnZlckNvbm5lY3Rp b246OnBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyRnJvbVNlcnZpY2VXb3JrZXIoU2VydmljZVcK ICAgICAgICAgcmV0dXJuOwogCiAgICAgLy8gSXQncyBwb3NzaWJsZSB0aGlzIHNwZWNpZmljIHdv cmtlciBjYW5ub3QgYmUgcmUtcnVuIChlLmcuIGl0cyByZWdpc3RyYXRpb24gaGFzIGJlZW4gcmVt b3ZlZCkKLSAgICBzZXJ2ZXIoKS5ydW5TZXJ2aWNlV29ya2VySWZOZWNlc3NhcnkoZGVzdGluYXRp b25JZGVudGlmaWVyLCBbZGVzdGluYXRpb25JZGVudGlmaWVyLCBtZXNzYWdlID0gV1RGTW92ZSht ZXNzYWdlKSwgc291cmNlRGF0YSA9IHNvdXJjZVdvcmtlci0+ZGF0YSgpXShib29sIHN1Y2Nlc3Ms IGF1dG8mIGNvbnRleHRDb25uZWN0aW9uKSBtdXRhYmxlIHsKKyAgICBzZXJ2ZXIoKS5ydW5TZXJ2 aWNlV29ya2VySWZOZWNlc3NhcnkoZGVzdGluYXRpb25JZGVudGlmaWVyLCBbZGVzdGluYXRpb25J ZGVudGlmaWVyLCBtZXNzYWdlID0gbWVzc2FnZS52ZWN0b3IoKSwgc291cmNlRGF0YSA9IHNvdXJj ZVdvcmtlci0+ZGF0YSgpXShib29sIHN1Y2Nlc3MsIGF1dG8mIGNvbnRleHRDb25uZWN0aW9uKSBt dXRhYmxlIHsKICAgICAgICAgaWYgKCFzdWNjZXNzKQogICAgICAgICAgICAgcmV0dXJuOwogCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cK aW5kZXggOWU5ZTZjYTI4OTAxZGFiMmY0ZTU0MTg1YzhkMzYwYzkwMWYxN2MxNC4uYWVjODk1MjFh OWQ4MjMxYWQ1MzA0ZjMyY2Q3ZGQwNDM0NjQ5YjM1NiAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nCisrKyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisy MDE3LTEyLTExICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgTGF5 b3V0IFRlc3QgaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ct cHJvY2Vzcy1jcmFzaC5odHRwcy5odG1sIGlzIGZsYWt5CisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODA2NTkKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXdyaXRlIHRlc3Qgc28gdGhhdCBpdCBpcyBubyBs b25nZXIgZmxha3kuCisKKyAgICAgICAgKiBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wb3N0 bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLmh0dHBzLWV4cGVjdGVkLnR4dDoKKyAgICAg ICAgKiBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9yZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0 ZXItc3ctcHJvY2Vzcy1jcmFzaC13b3JrZXIuanM6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVz dHMvd29ya2Vycy9zZXJ2aWNlL3Jlc291cmNlcy9wb3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNz LWNyYXNoLmpzOgorCiAyMDE3LTEyLTExICBEYXZpZCBRdWVzYWRhICA8ZGF2aWRfcXVlc2FkYUBh cHBsZS5jb20+CiAKICAgICAgICAgVHVybiBvbiBFTkFCTEVfQVBQTElDQVRJT05fTUFOSUZFU1QK ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Bvc3Rt ZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2guaHR0cHMtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJv Y2Vzcy1jcmFzaC5odHRwcy1leHBlY3RlZC50eHQKaW5kZXggYzEwYzI4MTlmMDFkMTgzYjYyMzY5 MzdkM2U2YWExZTg3MDc1MDYxZi4uN2Y3MGQwNTVkNzY1YjYyMjExYjNmMzhmZTg4Mjc0ODJhYTA2 ZDdlNCAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uv cG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC5odHRwcy1leHBlY3RlZC50eHQKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcG9zdG1lc3NhZ2UtYWZ0 ZXItc3ctcHJvY2Vzcy1jcmFzaC5odHRwcy1leHBlY3RlZC50eHQKQEAgLTEsOCArMSw1IEBACi0q IFNlbmRpbmcgJ01lc3NhZ2UgMScgdG8gU2VydmljZSBXb3JrZXIKLVBBU1M6IENsaWVudCByZWNl aXZlZCBtZXNzYWdlIGZyb20gc2VydmljZSB3b3JrZXIsIG9yaWdpbjogaHR0cHM6Ly8xMjcuMC4w LjE6ODQ0MwotUEFTUzogU2VydmljZSB3b3JrZXIgcmVjZWl2ZWQgbWVzc2FnZSAnTWVzc2FnZSAx JyBmcm9tIG9yaWdpbiAnaHR0cHM6Ly8xMjcuMC4wLjE6ODQ0MycKKyogU2VuZGluZyBTdGF0ZSB0 byBTZXJ2aWNlIFdvcmtlcgorKiBBc2tpbmcgU2VydmljZSBXb3JrZXIgaWYgaXQgcmVjZWl2ZWQg dGhlIHN0YXRlCiAqIFNpbXVsYXRpbmcgU2VydmljZSBXb3JrZXIgcHJvY2VzcyBjcmFzaAotKiBT ZW5kaW5nICdNZXNzYWdlIDInIHRvIFNlcnZpY2UgV29ya2VyCi1QQVNTOiBDbGllbnQgcmVjZWl2 ZWQgbWVzc2FnZSBmcm9tIHNlcnZpY2Ugd29ya2VyLCBvcmlnaW46IGh0dHBzOi8vMTI3LjAuMC4x Ojg0NDMKLVBBU1M6IFNlcnZpY2Ugd29ya2VyIHJlY2VpdmVkIG1lc3NhZ2UgJ01lc3NhZ2UgMicg ZnJvbSBvcmlnaW4gJ2h0dHBzOi8vMTI3LjAuMC4xOjg0NDMnCitQQVNTOiBzZXJ2aWNlIHdvcmtl ciBsb3N0IHRoZSBzdGF0ZSBhbmQgcmVzcG9uZGVkIHRoZSBwb3N0TWVzc2FnZSBhZnRlciBwcm9j ZXNzIHRlcm1pbmF0aW9uCiAKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29y a2Vycy9zZXJ2aWNlL3Jlc291cmNlcy9wb3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNo LXdvcmtlci5qcyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Jlc291 cmNlcy9wb3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLXdvcmtlci5qcwpuZXcgZmls ZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwLi4xYzZlYzgxMzEwN2UwOWVjZTk4ZDliOWRjZWY0MjFmYzdjOTk0M2ZkCi0tLSAvZGV2L251 bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcmVzb3VyY2Vz L3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2gtd29ya2VyLmpzCkBAIC0wLDAgKzEs MTUgQEAKK3ZhciBjbGllbnQgPSBudWxsOworbGV0IHJlY2VpdmVkU3RhdGUgPSBmYWxzZTsKKwor c2VsZi5hZGRFdmVudExpc3RlbmVyKCJtZXNzYWdlIiwgKGV2ZW50KSA9PiB7CisgICAgaWYgKGV2 ZW50LmRhdGEgPT09ICJTZXRTdGF0ZSIpIHsKKyAgICAgICAgcmVjZWl2ZWRTdGF0ZSA9IHRydWU7 CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBpZiAoZXZlbnQuZGF0YSA9PT0gIkhhc1N0 YXRlIikgeworICAgICAgICBldmVudC5zb3VyY2UucG9zdE1lc3NhZ2UocmVjZWl2ZWRTdGF0ZSk7 CisgICAgICAgIHJldHVybjsKKyAgICB9Cit9KTsKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcmVzb3VyY2VzL3Bvc3RtZXNzYWdlLWFmdGVyLXN3 LXByb2Nlc3MtY3Jhc2guanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2Vydmlj ZS9yZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC5qcwppbmRleCA0 ZTVlZDkyM2VkMWVjMTU3NTRiMWI3OWRiNDJjNGNkODAzZGEyYjU5Li45ZGE5MGQ4YWJhODA5Njhm YzcyNDk5ZmIzNDNlZDI5Y2Y3NWQxOGU4IDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9odHRwL3Rl c3RzL3dvcmtlcnMvc2VydmljZS9yZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vz cy1jcmFzaC5qcworKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9y ZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC5qcwpAQCAtMSwyOCAr MSwzNyBAQAotdmFyIG1lc3NhZ2VOdW1iZXIgPSAxOworbGV0IHNlcnZpY2VXb3JrZXJIYXNSZWNl aXZlZFN0YXRlID0gZmFsc2U7CitsZXQgd29ya2VyID0gbnVsbDsKKwogbmF2aWdhdG9yLnNlcnZp Y2VXb3JrZXIuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIGZ1bmN0aW9uKGV2ZW50KSB7Ci0g ICAgbG9nKCJQQVNTOiBDbGllbnQgcmVjZWl2ZWQgbWVzc2FnZSBmcm9tIHNlcnZpY2Ugd29ya2Vy LCBvcmlnaW46ICIgKyBldmVudC5vcmlnaW4pOwotICAgIGxvZyhldmVudC5kYXRhKTsKLSAgICBp ZiAobWVzc2FnZU51bWJlciA9PSAxKSB7CisgICAgaWYgKCFzZXJ2aWNlV29ya2VySGFzUmVjZWl2 ZWRTdGF0ZSkgeworICAgICAgICBpZiAoIWV2ZW50LmRhdGEpIHsKKyAgICAgICAgICAgIGxvZygi RkFJTDogc2VydmljZSB3b3JrZXIgZGlkIG5vdCByZWNlaXZlIHRoZSBzdGF0ZSIpOworICAgICAg ICAgICAgZmluaXNoU1dUZXN0KCk7CisgICAgICAgICAgICByZXR1cm47CisgICAgICAgIH0KKyAg ICAgICAgc2VydmljZVdvcmtlckhhc1JlY2VpdmVkU3RhdGUgPSB0cnVlOworCiAgICAgICAgIGxv ZygiKiBTaW11bGF0aW5nIFNlcnZpY2UgV29ya2VyIHByb2Nlc3MgY3Jhc2giKTsKICAgICAgICAg dGVzdFJ1bm5lci50ZXJtaW5hdGVTZXJ2aWNlV29ya2VyUHJvY2VzcygpOwotICAgICAgICBzZXRU aW1lb3V0KGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgbG9nKCIqIFNlbmRpbmcgJ01lc3NhZ2Ug MicgdG8gU2VydmljZSBXb3JrZXIiKTsKLSAgICAgICAgICAgIGV2ZW50LnNvdXJjZS5wb3N0TWVz c2FnZSgiTWVzc2FnZSAyIik7Ci0gICAgICAgICAgICBtZXNzYWdlTnVtYmVyKys7Ci0gICAgICAg ICAgICBoYW5kbGUgPSBzZXRUaW1lb3V0KGZ1bmN0aW9uKCkgewotICAgICAgICAgICAgICAgIGxv ZygiRkFJTDogRGlkIG5vdCByZWNlaXZlIG1lc3NhZ2UgZnJvbSBzZXJ2aWNlIHdvcmtlciBwcm9j ZXNzIGFmdGVyIHRoZSBjcmFzaCIpOwotICAgICAgICAgICAgICAgIGZpbmlzaFNXVGVzdCgpOwot ICAgICAgICAgICAgfSwgMTAwMCk7Ci0gICAgICAgIH0sIDApOworCisgICAgICAgIGhhbmRsZSA9 IHNldEludGVydmFsKGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgd29ya2VyLnBvc3RNZXNzYWdl KCJIYXNTdGF0ZSIpOworICAgICAgICB9LCAxMCk7CiAgICAgICAgIHJldHVybjsKICAgICB9Ci0g ICAgaWYgKG1lc3NhZ2VOdW1iZXIgPT0gMikgewotICAgICAgICBjbGVhclRpbWVvdXQoaGFuZGxl KTsKLSAgICAgICAgZmluaXNoU1dUZXN0KCk7Ci0gICAgfQorCisgICAgLy8gV29ya2VyIHN0aWxs IGhhcyB0aGUgc3RhdGUsIGl0IHdhcyBub3QgdGVybWluYXRlZCB5ZXQuCisgICAgaWYgKGV2ZW50 LmRhdGEgPT09IHNlcnZpY2VXb3JrZXJIYXNSZWNlaXZlZFN0YXRlKQorICAgICAgICByZXR1cm47 CisKKyAgICBsb2coIlBBU1M6IHNlcnZpY2Ugd29ya2VyIGxvc3QgdGhlIHN0YXRlIGFuZCByZXNw b25kZWQgdGhlIHBvc3RNZXNzYWdlIGFmdGVyIHByb2Nlc3MgdGVybWluYXRpb24iKTsKKyAgICBj bGVhckludGVydmFsKGhhbmRsZSk7CisgICAgZmluaXNoU1dUZXN0KCk7CiB9KTsKIAotbmF2aWdh dG9yLnNlcnZpY2VXb3JrZXIucmVnaXN0ZXIoInJlc291cmNlcy9wb3N0bWVzc2FnZS1lY2hvLXdv cmtlci5qcyIsIHsgfSkudGhlbihmdW5jdGlvbihyZWdpc3RyYXRpb24pIHsKLSAgICBsb2coIiog U2VuZGluZyAnTWVzc2FnZSAxJyB0byBTZXJ2aWNlIFdvcmtlciIpOwotICAgIHJlZ2lzdHJhdGlv bi5pbnN0YWxsaW5nLnBvc3RNZXNzYWdlKCJNZXNzYWdlIDEiKTsKK25hdmlnYXRvci5zZXJ2aWNl V29ya2VyLnJlZ2lzdGVyKCJyZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1j cmFzaC13b3JrZXIuanMiLCB7IH0pLnRoZW4oZnVuY3Rpb24ocmVnaXN0cmF0aW9uKSB7CisgICAg d29ya2VyID0gcmVnaXN0cmF0aW9uLmluc3RhbGxpbmc7CisgICAgbG9nKCIqIFNlbmRpbmcgU3Rh dGUgdG8gU2VydmljZSBXb3JrZXIiKTsKKyAgICB3b3JrZXIucG9zdE1lc3NhZ2UoIlNldFN0YXRl Iik7CisgICAgbG9nKCIqIEFza2luZyBTZXJ2aWNlIFdvcmtlciBpZiBpdCByZWNlaXZlZCB0aGUg c3RhdGUiKTsKKyAgICB3b3JrZXIucG9zdE1lc3NhZ2UoIkhhc1N0YXRlIik7CiB9KTsK 329034 2017-12-11 14:16:06 -0800 2017-12-11 14:49:13 -0800 Patch bug-180659-20171211141605.patch text/plain 8974 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjI1NzQ4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ2MGQ2NmE1ZTYwZjhlM2Zh MGM3NjdmZDUyM2M0ZWE4MWQ4NTM2YzMuLjE2NzQ0ZGRmMjhmZTA2MGY1Yzc3NWI1OTdhMjhlY2I0 NGRhNTk0N2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTctMTItMTEgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMYXlvdXQgVGVzdCBodHRwL3Rlc3Rz L3dvcmtlcnMvc2VydmljZS9wb3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLmh0dHBz Lmh0bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTE4MDY1OQorCisgICAgICAgIFJldmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAg ICAgICAgRml4IGZsYWt5IGNyYXNoIGR1ZSB0byBjYXB0dXJpbmcgYW4gSVBDOjpEYXRhUmVmZXJl bmNlIGluIGEgbGFtYmRhLCB3aGljaCB3b3VsZCBwb2ludCB0byBpbnZhbGlkCisgICAgICAgIG1l bW9yeSB3aGVuIHRoZSBsYW1iZGEgaXMgY2FsbGVkIGFzeW5jaHJvbm91c2x5LgorCisgICAgICAg ICogU3RvcmFnZVByb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3Bw OgorICAgICAgICAoV2ViS2l0OjpXZWJTV1NlcnZlckNvbm5lY3Rpb246OnBvc3RNZXNzYWdlVG9T ZXJ2aWNlV29ya2VyRnJvbUNsaWVudCk6CisgICAgICAgIChXZWJLaXQ6OldlYlNXU2VydmVyQ29u bmVjdGlvbjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXJGcm9tU2VydmljZVdvcmtlcik6CisK IDIwMTctMTItMTEgIERhdmlkIFF1ZXNhZGEgIDxkYXZpZF9xdWVzYWRhQGFwcGxlLmNvbT4KIAog ICAgICAgICBUdXJuIG9uIEVOQUJMRV9BUFBMSUNBVElPTl9NQU5JRkVTVApkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9TdG9yYWdlUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29u bmVjdGlvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIv V2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcAppbmRleCA3NDgxMWY0NzllZmRiMDgxZmJhOGYyOWZm MGRmOTRjYmIzYzIzYzA2Li45MGM5N2IzZDIxOWJlZTRiYjlhYTJiMmIzNWIyN2JiZjMyNjczOGM3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9jZXNzL1NlcnZpY2VXb3JrZXIv V2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1N0b3JhZ2VQcm9j ZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcApAQCAtMTMwLDcgKzEz MCw3IEBAIHZvaWQgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKHVpbnQ2NF90IGZl dGNoSWRlbnRpZmllciwgU2VydmljZVdvcmtlcklkCiB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlv bjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXJGcm9tQ2xpZW50KFNlcnZpY2VXb3JrZXJJZGVu dGlmaWVyIGRlc3RpbmF0aW9uSWRlbnRpZmllciwgSVBDOjpEYXRhUmVmZXJlbmNlJiYgbWVzc2Fn ZSwgU2VydmljZVdvcmtlckNsaWVudElkZW50aWZpZXIgc291cmNlSWRlbnRpZmllciwgU2Vydmlj ZVdvcmtlckNsaWVudERhdGEmJiBzb3VyY2VEYXRhKQogewogICAgIC8vIEl0J3MgcG9zc2libGUg dGhpcyBzcGVjaWZpYyB3b3JrZXIgY2Fubm90IGJlIHJlLXJ1biAoZS5nLiBpdHMgcmVnaXN0cmF0 aW9uIGhhcyBiZWVuIHJlbW92ZWQpCi0gICAgc2VydmVyKCkucnVuU2VydmljZVdvcmtlcklmTmVj ZXNzYXJ5KGRlc3RpbmF0aW9uSWRlbnRpZmllciwgW2Rlc3RpbmF0aW9uSWRlbnRpZmllciwgbWVz c2FnZSA9IFdURk1vdmUobWVzc2FnZSksIHNvdXJjZUlkZW50aWZpZXIsIHNvdXJjZURhdGEgPSBX VEZNb3ZlKHNvdXJjZURhdGEpXShib29sIHN1Y2Nlc3MsIGF1dG8mIGNvbnRleHRDb25uZWN0aW9u KSBtdXRhYmxlIHsKKyAgICBzZXJ2ZXIoKS5ydW5TZXJ2aWNlV29ya2VySWZOZWNlc3NhcnkoZGVz dGluYXRpb25JZGVudGlmaWVyLCBbZGVzdGluYXRpb25JZGVudGlmaWVyLCBtZXNzYWdlID0gbWVz c2FnZS52ZWN0b3IoKSwgc291cmNlSWRlbnRpZmllciwgc291cmNlRGF0YSA9IFdURk1vdmUoc291 cmNlRGF0YSldKGJvb2wgc3VjY2VzcywgYXV0byYgY29udGV4dENvbm5lY3Rpb24pIG11dGFibGUg ewogICAgICAgICBpZiAoc3VjY2VzcykKICAgICAgICAgICAgIHNlbmRUb0NvbnRleHRQcm9jZXNz KGNvbnRleHRDb25uZWN0aW9uLCBNZXNzYWdlczo6V2ViU1dDb250ZXh0TWFuYWdlckNvbm5lY3Rp b246OlBvc3RNZXNzYWdlVG9TZXJ2aWNlV29ya2VyRnJvbUNsaWVudCB7IGRlc3RpbmF0aW9uSWRl bnRpZmllciwgbWVzc2FnZSwgc291cmNlSWRlbnRpZmllciwgV1RGTW92ZShzb3VyY2VEYXRhKSB9 KTsKICAgICB9KTsKQEAgLTE0Myw3ICsxNDMsNyBAQCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlv bjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXJGcm9tU2VydmljZVdvcmtlcihTZXJ2aWNlVwog ICAgICAgICByZXR1cm47CiAKICAgICAvLyBJdCdzIHBvc3NpYmxlIHRoaXMgc3BlY2lmaWMgd29y a2VyIGNhbm5vdCBiZSByZS1ydW4gKGUuZy4gaXRzIHJlZ2lzdHJhdGlvbiBoYXMgYmVlbiByZW1v dmVkKQotICAgIHNlcnZlcigpLnJ1blNlcnZpY2VXb3JrZXJJZk5lY2Vzc2FyeShkZXN0aW5hdGlv bklkZW50aWZpZXIsIFtkZXN0aW5hdGlvbklkZW50aWZpZXIsIG1lc3NhZ2UgPSBXVEZNb3ZlKG1l c3NhZ2UpLCBzb3VyY2VEYXRhID0gc291cmNlV29ya2VyLT5kYXRhKCldKGJvb2wgc3VjY2Vzcywg YXV0byYgY29udGV4dENvbm5lY3Rpb24pIG11dGFibGUgeworICAgIHNlcnZlcigpLnJ1blNlcnZp Y2VXb3JrZXJJZk5lY2Vzc2FyeShkZXN0aW5hdGlvbklkZW50aWZpZXIsIFtkZXN0aW5hdGlvbklk ZW50aWZpZXIsIG1lc3NhZ2UgPSBtZXNzYWdlLnZlY3RvcigpLCBzb3VyY2VEYXRhID0gc291cmNl V29ya2VyLT5kYXRhKCldKGJvb2wgc3VjY2VzcywgYXV0byYgY29udGV4dENvbm5lY3Rpb24pIG11 dGFibGUgewogICAgICAgICBpZiAoIXN1Y2Nlc3MpCiAgICAgICAgICAgICByZXR1cm47CiAKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCA5ZTllNmNhMjg5MDFkYWIyZjRlNTQxODVjOGQzNjBjOTAxZjE3YzE0Li5lZWZmNzcxOWZk OTNkOTgwOTZiNDc2YWYzZTkwNjQ5ZTQwZDFhN2ZkIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIw MTctMTItMTEgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBMYXlv dXQgVGVzdCBodHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wb3N0bWVzc2FnZS1hZnRlci1zdy1w cm9jZXNzLWNyYXNoLmh0dHBzLmh0bWwgaXMgZmxha3kKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MDY1OQorCisgICAgICAgIFJldmlld2VkIGJ5IFlv dWVubiBGYWJsZXQuCisKKyAgICAgICAgUmV3cml0ZSB0ZXN0IHNvIHRoYXQgaXQgaXMgbm8gbG9u Z2VyIGZsYWt5LgorCisgICAgICAgICogaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcG9zdG1l c3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC5odHRwcy1leHBlY3RlZC50eHQ6CisgICAgICAg ICogaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcmVzb3VyY2VzL3Bvc3RtZXNzYWdlLWFmdGVy LXN3LXByb2Nlc3MtY3Jhc2gtd29ya2VyLmpzOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rlc3Rz L3dvcmtlcnMvc2VydmljZS9yZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1j cmFzaC5qczoKKwogMjAxNy0xMi0xMSAgRGF2aWQgUXVlc2FkYSAgPGRhdmlkX3F1ZXNhZGFAYXBw bGUuY29tPgogCiAgICAgICAgIFR1cm4gb24gRU5BQkxFX0FQUExJQ0FUSU9OX01BTklGRVNUCmRp ZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9wb3N0bWVz c2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRl c3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nl c3MtY3Jhc2guaHR0cHMtZXhwZWN0ZWQudHh0CmluZGV4IGMxMGMyODE5ZjAxZDE4M2I2MjM2OTM3 ZDNlNmFhMWU4NzA3NTA2MWYuLjdmNzBkMDU1ZDc2NWI2MjIxMWIzZjM4ZmU4ODI3NDgyYWEwNmQ3 ZTQgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Bv c3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2guaHR0cHMtZXhwZWN0ZWQudHh0CisrKyBi L0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Bvc3RtZXNzYWdlLWFmdGVy LXN3LXByb2Nlc3MtY3Jhc2guaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0xLDggKzEsNSBAQAotKiBT ZW5kaW5nICdNZXNzYWdlIDEnIHRvIFNlcnZpY2UgV29ya2VyCi1QQVNTOiBDbGllbnQgcmVjZWl2 ZWQgbWVzc2FnZSBmcm9tIHNlcnZpY2Ugd29ya2VyLCBvcmlnaW46IGh0dHBzOi8vMTI3LjAuMC4x Ojg0NDMKLVBBU1M6IFNlcnZpY2Ugd29ya2VyIHJlY2VpdmVkIG1lc3NhZ2UgJ01lc3NhZ2UgMScg ZnJvbSBvcmlnaW4gJ2h0dHBzOi8vMTI3LjAuMC4xOjg0NDMnCisqIFNlbmRpbmcgU3RhdGUgdG8g U2VydmljZSBXb3JrZXIKKyogQXNraW5nIFNlcnZpY2UgV29ya2VyIGlmIGl0IHJlY2VpdmVkIHRo ZSBzdGF0ZQogKiBTaW11bGF0aW5nIFNlcnZpY2UgV29ya2VyIHByb2Nlc3MgY3Jhc2gKLSogU2Vu ZGluZyAnTWVzc2FnZSAyJyB0byBTZXJ2aWNlIFdvcmtlcgotUEFTUzogQ2xpZW50IHJlY2VpdmVk IG1lc3NhZ2UgZnJvbSBzZXJ2aWNlIHdvcmtlciwgb3JpZ2luOiBodHRwczovLzEyNy4wLjAuMTo4 NDQzCi1QQVNTOiBTZXJ2aWNlIHdvcmtlciByZWNlaXZlZCBtZXNzYWdlICdNZXNzYWdlIDInIGZy b20gb3JpZ2luICdodHRwczovLzEyNy4wLjAuMTo4NDQzJworUEFTUzogc2VydmljZSB3b3JrZXIg bG9zdCB0aGUgc3RhdGUgYW5kIHJlc3BvbmRlZCB0aGUgcG9zdE1lc3NhZ2UgYWZ0ZXIgcHJvY2Vz cyB0ZXJtaW5hdGlvbgogCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtl cnMvc2VydmljZS9yZXNvdXJjZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC13 b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3dvcmtlcnMvc2VydmljZS9yZXNvdXJj ZXMvcG9zdG1lc3NhZ2UtYWZ0ZXItc3ctcHJvY2Vzcy1jcmFzaC13b3JrZXIuanMKbmV3IGZpbGUg bW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MC4uMWM2ZWM4MTMxMDdlMDllY2U5OGQ5YjlkY2VmNDIxZmM3Yzk5NDNmZAotLS0gL2Rldi9udWxs CisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Jlc291cmNlcy9w b3N0bWVzc2FnZS1hZnRlci1zdy1wcm9jZXNzLWNyYXNoLXdvcmtlci5qcwpAQCAtMCwwICsxLDE1 IEBACit2YXIgY2xpZW50ID0gbnVsbDsKK2xldCByZWNlaXZlZFN0YXRlID0gZmFsc2U7CisKK3Nl bGYuYWRkRXZlbnRMaXN0ZW5lcigibWVzc2FnZSIsIChldmVudCkgPT4geworICAgIGlmIChldmVu dC5kYXRhID09PSAiU2V0U3RhdGUiKSB7CisgICAgICAgIHJlY2VpdmVkU3RhdGUgPSB0cnVlOwor ICAgICAgICByZXR1cm47CisgICAgfQorCisgICAgaWYgKGV2ZW50LmRhdGEgPT09ICJIYXNTdGF0 ZSIpIHsKKyAgICAgICAgZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKHJlY2VpdmVkU3RhdGUpOwor ICAgICAgICByZXR1cm47CisgICAgfQorfSk7CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMvd29ya2Vycy9zZXJ2aWNlL3Jlc291cmNlcy9wb3N0bWVzc2FnZS1hZnRlci1zdy1w cm9jZXNzLWNyYXNoLmpzIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2Uv cmVzb3VyY2VzL3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2guanMKaW5kZXggNGU1 ZWQ5MjNlZDFlYzE1NzU0YjFiNzlkYjQyYzRjZDgwM2RhMmI1OS4uNGY3MjE2NGNhZmQ4Y2VjMDli ZDhhODJlNzZiYWFkYjIzZTkwNjhkZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy93b3JrZXJzL3NlcnZpY2UvcmVzb3VyY2VzL3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3Mt Y3Jhc2guanMKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy93b3JrZXJzL3NlcnZpY2UvcmVz b3VyY2VzL3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2guanMKQEAgLTEsMjggKzEs NDYgQEAKLXZhciBtZXNzYWdlTnVtYmVyID0gMTsKK2xldCBzZXJ2aWNlV29ya2VySGFzUmVjZWl2 ZWRTdGF0ZSA9IGZhbHNlOworbGV0IHdvcmtlciA9IG51bGw7CitsZXQgcmVtYWluaW5nQXR0ZW1w dHMgPSAxMDAwOyAvLyBXZSB0cnkgZm9yIDEwIHNlY29uZHMgYmVmb3JlIHRpbWluZyBvdXQuCisK IG5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLmFkZEV2ZW50TGlzdGVuZXIoIm1lc3NhZ2UiLCBmdW5j dGlvbihldmVudCkgewotICAgIGxvZygiUEFTUzogQ2xpZW50IHJlY2VpdmVkIG1lc3NhZ2UgZnJv bSBzZXJ2aWNlIHdvcmtlciwgb3JpZ2luOiAiICsgZXZlbnQub3JpZ2luKTsKLSAgICBsb2coZXZl bnQuZGF0YSk7Ci0gICAgaWYgKG1lc3NhZ2VOdW1iZXIgPT0gMSkgeworICAgIGlmICghc2Vydmlj ZVdvcmtlckhhc1JlY2VpdmVkU3RhdGUpIHsKKyAgICAgICAgaWYgKCFldmVudC5kYXRhKSB7Cisg ICAgICAgICAgICBsb2coIkZBSUw6IHNlcnZpY2Ugd29ya2VyIGRpZCBub3QgcmVjZWl2ZSB0aGUg c3RhdGUiKTsKKyAgICAgICAgICAgIGZpbmlzaFNXVGVzdCgpOworICAgICAgICAgICAgcmV0dXJu OworICAgICAgICB9CisgICAgICAgIHNlcnZpY2VXb3JrZXJIYXNSZWNlaXZlZFN0YXRlID0gdHJ1 ZTsKKwogICAgICAgICBsb2coIiogU2ltdWxhdGluZyBTZXJ2aWNlIFdvcmtlciBwcm9jZXNzIGNy YXNoIik7CiAgICAgICAgIHRlc3RSdW5uZXIudGVybWluYXRlU2VydmljZVdvcmtlclByb2Nlc3Mo KTsKLSAgICAgICAgc2V0VGltZW91dChmdW5jdGlvbigpIHsKLSAgICAgICAgICAgIGxvZygiKiBT ZW5kaW5nICdNZXNzYWdlIDInIHRvIFNlcnZpY2UgV29ya2VyIik7Ci0gICAgICAgICAgICBldmVu dC5zb3VyY2UucG9zdE1lc3NhZ2UoIk1lc3NhZ2UgMiIpOwotICAgICAgICAgICAgbWVzc2FnZU51 bWJlcisrOwotICAgICAgICAgICAgaGFuZGxlID0gc2V0VGltZW91dChmdW5jdGlvbigpIHsKLSAg ICAgICAgICAgICAgICBsb2coIkZBSUw6IERpZCBub3QgcmVjZWl2ZSBtZXNzYWdlIGZyb20gc2Vy dmljZSB3b3JrZXIgcHJvY2VzcyBhZnRlciB0aGUgY3Jhc2giKTsKKworICAgICAgICBoYW5kbGUg PSBzZXRJbnRlcnZhbChmdW5jdGlvbigpIHsKKyAgICAgICAgICAgIHJlbWFpbmluZ0F0dGVtcHRz LS07CisgICAgICAgICAgICBpZiAoIXJlbWFpbmluZ0F0dGVtcHRzKSB7CisgICAgICAgICAgICAg ICAgbG9nKCJGQUlMOiBzZXJ2aWNlIHdvcmtlciBkaWQgbm90IHJlc3BvbmQgYWZ0ZXIgcHJvY2Vz cyB0ZXJtaW5hdGlvbiIpOworICAgICAgICAgICAgICAgIGNsZWFySW50ZXJ2YWwoaGFuZGxlKTsK ICAgICAgICAgICAgICAgICBmaW5pc2hTV1Rlc3QoKTsKLSAgICAgICAgICAgIH0sIDEwMDApOwot ICAgICAgICB9LCAwKTsKKyAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICB9CisK KyAgICAgICAgICAgIHdvcmtlci5wb3N0TWVzc2FnZSgiSGFzU3RhdGUiKTsKKyAgICAgICAgfSwg MTApOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIGlmIChtZXNzYWdlTnVtYmVyID09IDIp IHsKLSAgICAgICAgY2xlYXJUaW1lb3V0KGhhbmRsZSk7Ci0gICAgICAgIGZpbmlzaFNXVGVzdCgp OwotICAgIH0KKworICAgIC8vIFdvcmtlciBzdGlsbCBoYXMgdGhlIHN0YXRlLCBpdCB3YXMgbm90 IHRlcm1pbmF0ZWQgeWV0LgorICAgIGlmIChldmVudC5kYXRhID09PSBzZXJ2aWNlV29ya2VySGFz UmVjZWl2ZWRTdGF0ZSkKKyAgICAgICAgcmV0dXJuOworCisgICAgbG9nKCJQQVNTOiBzZXJ2aWNl IHdvcmtlciBsb3N0IHRoZSBzdGF0ZSBhbmQgcmVzcG9uZGVkIHRoZSBwb3N0TWVzc2FnZSBhZnRl ciBwcm9jZXNzIHRlcm1pbmF0aW9uIik7CisgICAgY2xlYXJJbnRlcnZhbChoYW5kbGUpOworICAg IGZpbmlzaFNXVGVzdCgpOwogfSk7CiAKLW5hdmlnYXRvci5zZXJ2aWNlV29ya2VyLnJlZ2lzdGVy KCJyZXNvdXJjZXMvcG9zdG1lc3NhZ2UtZWNoby13b3JrZXIuanMiLCB7IH0pLnRoZW4oZnVuY3Rp b24ocmVnaXN0cmF0aW9uKSB7Ci0gICAgbG9nKCIqIFNlbmRpbmcgJ01lc3NhZ2UgMScgdG8gU2Vy dmljZSBXb3JrZXIiKTsKLSAgICByZWdpc3RyYXRpb24uaW5zdGFsbGluZy5wb3N0TWVzc2FnZSgi TWVzc2FnZSAxIik7CituYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5yZWdpc3RlcigicmVzb3VyY2Vz L3Bvc3RtZXNzYWdlLWFmdGVyLXN3LXByb2Nlc3MtY3Jhc2gtd29ya2VyLmpzIiwgeyB9KS50aGVu KGZ1bmN0aW9uKHJlZ2lzdHJhdGlvbikgeworICAgIHdvcmtlciA9IHJlZ2lzdHJhdGlvbi5pbnN0 YWxsaW5nOworICAgIGxvZygiKiBTZW5kaW5nIFN0YXRlIHRvIFNlcnZpY2UgV29ya2VyIik7Cisg ICAgd29ya2VyLnBvc3RNZXNzYWdlKCJTZXRTdGF0ZSIpOworICAgIGxvZygiKiBBc2tpbmcgU2Vy dmljZSBXb3JrZXIgaWYgaXQgcmVjZWl2ZWQgdGhlIHN0YXRlIik7CisgICAgd29ya2VyLnBvc3RN ZXNzYWdlKCJIYXNTdGF0ZSIpOwogfSk7Cg==