205261 2019-12-16 02:53:46 -0800 http/wpt/service-workers/postMessage-fetch-order.https.html is a flaky failure after r253528 2019-12-16 08:17:24 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=205225 InRadar P2 Normal --- 1 youennf youennf cdumez webkit-bug-importer oldest_to_newest 1598823 0 youennf 2019-12-16 02:53:46 -0800 http/wpt/service-workers/postMessage-fetch-order.https.html is a flaky failure after r253528 1598826 1 385747 youennf 2019-12-16 03:08:57 -0800 Created attachment 385747 Patch 1598840 2 385754 youennf 2019-12-16 05:25:29 -0800 Created attachment 385754 Patch 1598897 3 385754 cdumez 2019-12-16 08:09:36 -0800 Comment on attachment 385754 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=385754&action=review > Source/WebKit/ChangeLog:8 > + Instead of starting the fetch task asycnhronously, start it synchronously but make sure that typo: asycnhronously > Source/WebKit/NetworkProcess/ServiceWorker/WebSWServerToContextConnection.cpp:179 > // Signal load failure for them Missing period at the end. 1598900 4 cdumez 2019-12-16 08:16:04 -0800 Committed r253554: <https://trac.webkit.org/changeset/253554> 1598901 5 webkit-bug-importer 2019-12-16 08:17:24 -0800 <rdar://problem/57969320> 385747 2019-12-16 03:08:57 -0800 2019-12-16 05:25:25 -0800 Patch bug-205261-20191216120856.patch text/plain 10252 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNhMzRmMTBjZWJhYTY5OGRj ODQyYzcxZTQyMzYxOWMxZWVlNGZjYTIuLjg3MDM4M2E5YTU3YTEyMTQyYTFhZDhjZTE0NTlkODBl NDFkYmY2YWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzEgQEAKKzIwMTktMTItMTYgIHlvdWVubiBm YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHAvd3B0L3NlcnZpY2Utd29y a2Vycy9wb3N0TWVzc2FnZS1mZXRjaC1vcmRlci5odHRwcy5odG1sIGlzIGEgZmxha3kgZmFpbHVy ZSBhZnRlciByMjUzNTI4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDUyNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbnN0ZWFkIG9mIHN0YXJ0aW5nIHRoZSBmZXRjaCB0YXNrIGFzeWNuaHJvbm91c2x5 LCBzdGFydCBpdCBzeW5jaHJvbm91c2x5IGJ1dCBtYWtlIHN1cmUgdGhhdAorICAgICAgICBub3Qg aGFuZGxpbmcgdGhlIGZldGNoIGlzIGVpdGhlciBjb21pbmcgZnJvbSBJUEMgb3IgaXMgZG9uZSBh c3luY2hyb25vdXNseS4KKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cyBhbmQgdW5m bGFrZXMgYWJvdmUgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3Jr ZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VX b3JrZXJGZXRjaFRhc2s6OmRpZE5vdEhhbmRsZSk6CisgICAgICAgIE1ha2Ugc3VyZSB0byBjYWxs IGRpZE5vdEhhbmRsZSBvbmx5IG9uY2UgYmFlZCBvbiB0aGUgdGltZW91dCB0aW1lci4KKyAgICAg ICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6Y2Fubm90SGFuZGxlKToKKyAgICAg ICAgRG8gbm90IGV4cG9zZSBkaWROb3RIYW5kbGUgYXMgYSBwdWJsaWMgbWV0aG9kLgorICAgICAg ICBJbnN0ZWFkIGV4cG9zZSBjYW5ub3RIYW5kbGUgdGhhdCB3aWxsIGNhbGwgZGlkTm90SGFuZGxl IGFzeW5jaHJvbm91c2x5LgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNr Ojpjb250aW51ZUZldGNoVGFza1dpdGgpOgorICAgICAgICBEcml2ZS1ieSBmaXgsIHdlIHNob3Vs ZCBvbmx5IHNldCB0aGUgdGltZW91dCB0aW1lciBpZiB3ZSBzdGFydCBhIGZldGNoLgorICAgICAg ICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5o OgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjp3YXNIYW5kbGVkIGNv bnN0KToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVy Q29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXU2VydmVyQ29ubmVjdGlvbjo6 c3RhcnRGZXRjaCk6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJT V1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24uY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJTV1Nl cnZlclRvQ29udGV4dENvbm5lY3Rpb246OmZldGNoVGFza1RpbWVkT3V0KToKKyAgICAgICAgU21h bGwgcmVmYWN0b3JpbmcgdG8gb25seSB1c2UgY29udGV4dENsb3NlZCBhbmQgbm90IGV4cG9zZSB3 aGV0aGVyIHRoZSB0YXNrIGlzIGhhbmRsZWQgb3Igbm90LgorICAgICAgICBUaGlzIGFsc28gcG90 ZW50aWFsbHkgYWxsb3dzIHRvIGNhbGwgZGlkTm90SGFuZGxlIGluIGNhc2UgdGhlIHNlcnZpY2Ug d29ya2VyIGNyYXNoZWQgYmVmb3JlIGFuc3dlcmluZyB0aGUgZmV0Y2ggZXZlbnQuCisKIDIwMTkt MTItMTUgIHlvdWVubiBmYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIFJlc2V0 IGNhY2hlZCBnZXRVc2VyTWVkaWEgcXVlcmllcyB3aGVuIGNhbGxpbmcgc3RvcE1lZGlhQ2FwdHVy ZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2Vy L1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vz cy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwCmluZGV4IDFiZTA0MjBk NzU3NzhjZWRmNmIzNGY0NDBjNDZiNTBmMjg0MjQzNTUuLjIyMTdlZGVmN2VkMzZhOWI1ZDA2ZmNk NmU5ZTUxMDI5ZWRjZjU3MmYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmNwcAorKysgYi9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFz ay5jcHAKQEAgLTkwLDcgKzkwLDExIEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3Rh cnQoV2ViU1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uJiBzZXJ2aWNlV29ya2VyCiB2b2lkIFNl cnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNvbnRleHRDbG9zZWQoKQogewogICAgIG1fc2VydmljZVdv cmtlckNvbm5lY3Rpb24gPSBudWxscHRyOwotICAgIGRpZEZhaWwoUmVzb3VyY2VFcnJvciB7IGVy cm9yRG9tYWluV2ViS2l0SW50ZXJuYWwsIDAsIHsgfSwgIlNlcnZpY2UgV29ya2VyIGNvbnRleHQg Y2xvc2VkIl9zIH0pOworICAgIGlmICh3YXNIYW5kbGVkKCkpIHsKKyAgICAgICAgZGlkRmFpbChS ZXNvdXJjZUVycm9yIHsgZXJyb3JEb21haW5XZWJLaXRJbnRlcm5hbCwgMCwgeyB9LCAiU2Vydmlj ZSBXb3JrZXIgY29udGV4dCBjbG9zZWQiX3MgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9Cisg ICAgY2Fubm90SGFuZGxlKCk7CiB9CiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3Rh cnRGZXRjaCgpCkBAIC0xNjEsNiArMTY1LDkgQEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNr OjpkaWRGYWlsKGNvbnN0IFJlc291cmNlRXJyb3ImIGVycm9yKQogCiB2b2lkIFNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2s6OmRpZE5vdEhhbmRsZSgpCiB7CisgICAgaWYgKHdhc0hhbmRsZWQoKSkKKyAg ICAgICAgcmV0dXJuOworCiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkTm90SGFuZGxl RmV0Y2g6IGZldGNoSWRlbnRpZmllcjogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7CiAgICAgbV90aW1lb3V0VGltZXIuc3RvcCgpOwogICAgIHNv ZnRVcGRhdGVJZk5lZWRlZCgpOwpAQCAtMTY4LDYgKzE3NSwxNiBAQCB2b2lkIFNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2s6OmRpZE5vdEhhbmRsZSgpCiAgICAgbV9sb2FkZXIuc2VydmljZVdvcmtlckRp ZE5vdEhhbmRsZSh0aGlzKTsKIH0KIAordm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjYW5u b3RIYW5kbGUoKQoreworICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbm5vdEhhbmRsZTog ZmV0Y2hJZGVudGlmaWVyOiAlcyIsIG1fZmV0Y2hJZGVudGlmaWVyLmxvZ2dpbmdTdHJpbmcoKS51 dGY4KCkuZGF0YSgpKTsKKyAgICAvLyBNYWtlIHN1cmUgd2UgY2FsbCBkaWROb3RIYW5kbGUgYXN5 bmNocm9ub3VzbHkgYmVjYXVzZSBmYWlsaW5nIHN5bmNocm9ub3VzbHkgd291bGQgZ2V0IHRoZSBO ZXR3b3JrUmVzb3VyY2VMb2FkZXIgaW4gYSBiYWQgc3RhdGUuCisgICAgUnVuTG9vcDo6bWFpbigp LmRpc3BhdGNoKFt3ZWFrVGhpcyA9IG1ha2VXZWFrUHRyKHRoaXMpXSB7CisgICAgICAgIGlmICh3 ZWFrVGhpcykKKyAgICAgICAgICAgIHdlYWtUaGlzLT5kaWROb3RIYW5kbGUoKTsKKyAgICB9KTsK K30KKwogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpjYW5jZWxGcm9tQ2xpZW50KCkKIHsK ICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJjYW5jZWxGcm9tQ2xpZW50OiBmZXRjaElkZW50 aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRh KCkpOwpAQCAtMTgxLDExICsxOTgsMTEgQEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpj b250aW51ZURpZFJlY2VpdmVGZXRjaFJlc3BvbnNlKCkKIAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrOjpjb250aW51ZUZldGNoVGFza1dpdGgoUmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCkK IHsKLSAgICBtX3RpbWVvdXRUaW1lci5zdGFydE9uZVNob3QobV9sb2FkZXIuY29ubmVjdGlvblRv V2ViUHJvY2VzcygpLm5ldHdvcmtQcm9jZXNzKCkuc2VydmljZVdvcmtlckZldGNoVGltZW91dCgp KTsKICAgICBpZiAoIW1fc2VydmljZVdvcmtlckNvbm5lY3Rpb24pIHsKICAgICAgICAgbV9sb2Fk ZXIuc2VydmljZVdvcmtlckRpZE5vdEhhbmRsZSh0aGlzKTsKICAgICAgICAgcmV0dXJuOwogICAg IH0KKyAgICBtX3RpbWVvdXRUaW1lci5zdGFydE9uZVNob3QobV9sb2FkZXIuY29ubmVjdGlvblRv V2ViUHJvY2VzcygpLm5ldHdvcmtQcm9jZXNzKCkuc2VydmljZVdvcmtlckZldGNoVGltZW91dCgp KTsKICAgICBtX2N1cnJlbnRSZXF1ZXN0ID0gV1RGTW92ZShyZXF1ZXN0KTsKICAgICBzdGFydEZl dGNoKCk7CiB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZp Y2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5oIGIvU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suaAppbmRleCA1ZGI5 M2MxYjBiNmRmMmIxZjkwMjFkZGY5MWE3M2YxNjI3MDZjMTkzLi5mYzk4MGIyMGNlNGMwZDkxYjdh NTBlY2VkMmYyOGM5MzE5NjA5OTkxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5oCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hU YXNrLmgKQEAgLTYxLDcgKzYxLDYgQEAgcHVibGljOgogCiAgICAgdm9pZCBzdGFydChXZWJTV1Nl cnZlclRvQ29udGV4dENvbm5lY3Rpb24mKTsKICAgICB2b2lkIGNhbmNlbEZyb21DbGllbnQoKTsK LSAgICB2b2lkIGZhaWwoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYgZXJyb3IpIHsgZGlk RmFpbChlcnJvcik7IH0KICAgICB2b2lkIGRpZFJlY2VpdmVNZXNzYWdlKElQQzo6Q29ubmVjdGlv biYsIElQQzo6RGVjb2RlciYpOwogCiAgICAgdm9pZCBjb250aW51ZURpZFJlY2VpdmVGZXRjaFJl c3BvbnNlKCk7CkBAIC03MCwxMSArNjksOSBAQCBwdWJsaWM6CiAgICAgV2ViQ29yZTo6RmV0Y2hJ ZGVudGlmaWVyIGZldGNoSWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fZmV0Y2hJZGVudGlm aWVyOyB9CiAgICAgV2ViQ29yZTo6U2VydmljZVdvcmtlcklkZW50aWZpZXIgc2VydmljZVdvcmtl cklkZW50aWZpZXIoKSBjb25zdCB7IHJldHVybiBtX3NlcnZpY2VXb3JrZXJJZGVudGlmaWVyOyB9 CiAKLSAgICB2b2lkIGRpZE5vdEhhbmRsZSgpOwotCiAgICAgV2ViQ29yZTo6UmVzb3VyY2VSZXF1 ZXN0IHRha2VSZXF1ZXN0KCkgeyByZXR1cm4gV1RGTW92ZShtX2N1cnJlbnRSZXF1ZXN0KTsgfQot ICAgIGJvb2wgd2FzSGFuZGxlZCgpIGNvbnN0IHsgcmV0dXJuIG1fd2FzSGFuZGxlZDsgfQogCisg ICAgdm9pZCBjYW5ub3RIYW5kbGUoKTsKICAgICB2b2lkIGNvbnRleHRDbG9zZWQoKTsKIAogcHJp dmF0ZToKQEAgLTg0LDcgKzgxLDkgQEAgcHJpdmF0ZToKICAgICB2b2lkIGRpZFJlY2VpdmVGb3Jt RGF0YShjb25zdCBJUEM6OkZvcm1EYXRhUmVmZXJlbmNlJik7CiAgICAgdm9pZCBkaWRGaW5pc2go KTsKICAgICB2b2lkIGRpZEZhaWwoY29uc3QgV2ViQ29yZTo6UmVzb3VyY2VFcnJvciYpOworICAg IHZvaWQgZGlkTm90SGFuZGxlKCk7CiAKKyAgICBib29sIHdhc0hhbmRsZWQoKSBjb25zdCB7IHJl dHVybiAhbV90aW1lb3V0VGltZXIuaXNBY3RpdmUoKTsgfQogICAgIHZvaWQgc3RhcnRGZXRjaCgp OwogCiAgICAgdm9pZCB0aW1lb3V0VGltZXJGaXJlZCgpOwpAQCAtMTAwLDcgKzk5LDYgQEAgcHJp dmF0ZToKICAgICBXZWJDb3JlOjpTZXJ2aWNlV29ya2VySWRlbnRpZmllciBtX3NlcnZpY2VXb3Jr ZXJJZGVudGlmaWVyOwogICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVzdCBtX2N1cnJlbnRSZXF1 ZXN0OwogICAgIFdlYkNvcmU6OlRpbWVyIG1fdGltZW91dFRpbWVyOwotICAgIGJvb2wgbV93YXNI YW5kbGVkIHsgZmFsc2UgfTsKICAgICBXZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9u SWRlbnRpZmllciBtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyOwogICAgIGJv b2wgbV9zaG91bGRTb2Z0VXBkYXRlIHsgZmFsc2UgfTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9u LmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1Nl cnZlckNvbm5lY3Rpb24uY3BwCmluZGV4IGE1OTExNGNhMjY4ZTlhZjQzNTlhYzI5MjE0Yjg0MGE5 MGY5M2IxNDEuLjI1ODFlMTIzNjZlOTdjOGIzZWQ1MzY5YjljNmYxMzMyZmQ4NGViODYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1Nl cnZlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2Vy dmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwCkBAIC0xOTcsMTkgKzE5NywxOSBA QCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaChTZXJ2aWNlV29ya2VyRmV0 Y2hUYXNrJiB0YXNrLCBTV1NlcnZlcldvcgogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAg IGlmICghd2Vha1RoaXMpIHsKLSAgICAgICAgICAgIHRhc2stPmRpZE5vdEhhbmRsZSgpOworICAg ICAgICAgICAgdGFzay0+Y2Fubm90SGFuZGxlKCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAg ICAgIH0KIAogICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKICAgICAgICAgICAgIFNXU0VSVkVSQ09O TkVDVElPTl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzdGFydEZldGNoOiBmZXRjaElk ZW50aWZpZXI6ICVzIERpZE5vdEhhbmRsZSBiZWNhdXNlIHdvcmtlciBkaWQgbm90IGJlY29tZSBh Y3RpdmF0ZWQiLCB0YXNrLT5mZXRjaElkZW50aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgp LmRhdGEoKSk7Ci0gICAgICAgICAgICB0YXNrLT5kaWROb3RIYW5kbGUoKTsKKyAgICAgICAgICAg IHRhc2stPmNhbm5vdEhhbmRsZSgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAK ICAgICAgICAgYXV0byogd29ya2VyID0gc2VydmVyKCkud29ya2VyQnlJRCh0YXNrLT5zZXJ2aWNl V29ya2VySWRlbnRpZmllcigpKTsKICAgICAgICAgaWYgKCF3b3JrZXIgfHwgd29ya2VyLT5oYXNU aW1lZE91dEFueUZldGNoVGFza3MoKSkgewotICAgICAgICAgICAgdGFzay0+ZGlkTm90SGFuZGxl KCk7CisgICAgICAgICAgICB0YXNrLT5jYW5ub3RIYW5kbGUoKTsKICAgICAgICAgICAgIHJldHVy bjsKICAgICAgICAgfQogCkBAIC0yMjIsMTMgKzIyMiwxMyBAQCB2b2lkIFdlYlNXU2VydmVyQ29u bmVjdGlvbjo6c3RhcnRGZXRjaChTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrJiB0YXNrLCBTV1NlcnZl cldvcgogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIAogICAgICAgICAgICAg aWYgKCF3ZWFrVGhpcykgewotICAgICAgICAgICAgICAgIHRhc2stPmRpZE5vdEhhbmRsZSgpOwor ICAgICAgICAgICAgICAgIHRhc2stPmNhbm5vdEhhbmRsZSgpOwogICAgICAgICAgICAgICAgIHJl dHVybjsKICAgICAgICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCFjb250ZXh0Q29ubmVjdGlv bikgewogICAgICAgICAgICAgICAgIFNXU0VSVkVSQ09OTkVDVElPTl9SRUxFQVNFX0xPR19FUlJP Ul9JRl9BTExPV0VEKCJzdGFydEZldGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIERpZE5vdEhhbmRs ZSBiZWNhdXNlIGZhaWxlZCB0byBydW4gc2VydmljZSB3b3JrZXIiLCB0YXNrLT5mZXRjaElkZW50 aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgICAgICAgICAg dGFzay0+ZGlkTm90SGFuZGxlKCk7CisgICAgICAgICAgICAgICAgdGFzay0+Y2Fubm90SGFuZGxl KCk7CiAgICAgICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAg U1dTRVJWRVJDT05ORUNUSU9OX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2g6IFN0 YXJ0aW5nIGZldGNoICVzIHZpYSBzZXJ2aWNlIHdvcmtlciAlcyIsIHRhc2stPmZldGNoSWRlbnRp ZmllcigpLmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0YXNrLT5zZXJ2aWNlV29ya2Vy SWRlbnRpZmllcigpLmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI0MiwxMCAr MjQyLDcgQEAgdm9pZCBXZWJTV1NlcnZlckNvbm5lY3Rpb246OnN0YXJ0RmV0Y2goU2VydmljZVdv cmtlckZldGNoVGFzayYgdGFzaywgU1dTZXJ2ZXJXb3IKICAgICB9CiAKICAgICBBU1NFUlQod29y a2VyLnN0YXRlKCkgPT0gU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpOwotICAgIC8vIE1h a2Ugc3VyZSB3ZSBzdGFydCB0aGUgZmV0Y2ggYXN5bmNocm9ub3VzbHkgYmVjYXVzZSBmYWlsaW5n IHN5bmNocm9ub3VzbHkgd291bGQgZ2V0IHRoZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIgaW4gYSBi YWQgc3RhdGUuCi0gICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtydW5TZXJ2ZXJXb3JrZXJB bmRTdGFydEZldGNoID0gV1RGTW92ZShydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKV0oKSBt dXRhYmxlIHsKLSAgICAgICAgcnVuU2VydmVyV29ya2VyQW5kU3RhcnRGZXRjaCh0cnVlKTsKLSAg ICB9KTsKKyAgICBydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKHRydWUpOwogfQogCiB2b2lk IFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXIoU2Vydmlj ZVdvcmtlcklkZW50aWZpZXIgZGVzdGluYXRpb25JZGVudGlmaWVyLCBNZXNzYWdlV2l0aE1lc3Nh Z2VQb3J0cyYmIG1lc3NhZ2UsIGNvbnN0IFNlcnZpY2VXb3JrZXJPckNsaWVudElkZW50aWZpZXIm IHNvdXJjZUlkZW50aWZpZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLmNwcCBiL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlclRvQ29u dGV4dENvbm5lY3Rpb24uY3BwCmluZGV4IDRmMmJmMWI0OGE2MjNlZjU1ZWNiMmJlNzZjNjgyOTg3 OTUzYjZlM2UuLmUxZDVmNWUzZWQ5YTYxOTc3MjIzMDZmNGNlMjJkOGI5MTRjYWM4ZDkgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1Nl cnZlclRvQ29udGV4dENvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24uY3BwCkBA IC0xNzcsMTIgKzE3Nyw4IEBAIHZvaWQgV2ViU1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uOjpm ZXRjaFRhc2tUaW1lZE91dChTZXJ2aWNlV29ya2VySWRlbnRpZmllciBzCiAgICAgfQogCiAgICAg Ly8gU2lnbmFsIGxvYWQgZmFpbHVyZSBmb3IgdGhlbQotICAgIGZvciAoYXV0byogZmV0Y2hUYXNr IDogZmV0Y2hlcykgewotICAgICAgICBpZiAoZmV0Y2hUYXNrLT53YXNIYW5kbGVkKCkpCi0gICAg ICAgICAgICBmZXRjaFRhc2stPmZhaWwoeyBlcnJvckRvbWFpbldlYktpdEludGVybmFsLCAwLCB7 IH0sICJTZXJ2aWNlIFdvcmtlciBjb250ZXh0IGNsb3NlZCJfcyB9KTsKLSAgICAgICAgZWxzZQot ICAgICAgICAgICAgZmV0Y2hUYXNrLT5kaWROb3RIYW5kbGUoKTsKLSAgICB9CisgICAgZm9yIChh dXRvKiBmZXRjaFRhc2sgOiBmZXRjaGVzKQorICAgICAgICBmZXRjaFRhc2stPmNvbnRleHRDbG9z ZWQoKTsKIAogICAgIGlmIChtX3NlcnZlcikgewogICAgICAgICBpZiAoYXV0byogd29ya2VyID0g bV9zZXJ2ZXItPndvcmtlckJ5SUQoc2VydmljZVdvcmtlcklkZW50aWZpZXIpKSB7Cg== 385754 2019-12-16 05:25:29 -0800 2019-12-16 08:09:36 -0800 Patch bug-205261-20191216142527.patch text/plain 13033 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjUzNTQzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGNhMzRmMTBjZWJhYTY5OGRj ODQyYzcxZTQyMzYxOWMxZWVlNGZjYTIuLmY0NDNhZDM5ZTA0YmJlM2Y3OWE1N2RkZDUwNzkyNzhk Mjc4NDIyYTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsNDQgQEAKKzIwMTktMTItMTYgIHlvdWVubiBm YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIGh0dHAvd3B0L3NlcnZpY2Utd29y a2Vycy9wb3N0TWVzc2FnZS1mZXRjaC1vcmRlci5odHRwcy5odG1sIGlzIGEgZmxha3kgZmFpbHVy ZSBhZnRlciByMjUzNTI4CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMDUyNjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBJbnN0ZWFkIG9mIHN0YXJ0aW5nIHRoZSBmZXRjaCB0YXNrIGFzeWNuaHJvbm91c2x5 LCBzdGFydCBpdCBzeW5jaHJvbm91c2x5IGJ1dCBtYWtlIHN1cmUgdGhhdAorICAgICAgICBub3Qg aGFuZGxpbmcgdGhlIGZldGNoIGlzIGVpdGhlciBjb21pbmcgZnJvbSBJUEMgb3IgaXMgZG9uZSBh c3luY2hyb25vdXNseS4KKworICAgICAgICBXZSBhZGQgYSBib29sZWFuIG1faXNEb25lIHRoYXQg ZW5zdXJlcyB0aGF0IHRoZSBsb2FkZXIgd2lsbCBvbmx5IGJlIGNhbGxlZCBvbmNlIGZvciBkaWRG YWlsL2RpZEZpbmlzaC9kaWROb3RIYW5kbGUuCisgICAgICAgIFRoaXMgY292ZXJzIHRoZSBwb3Rl bnRpYWwgY2FzZSBvZiBhIHRhc2sgZm9yIHdoaWNoIGNhbm5vdEhhbmRsZSBpcyBjYWxsZWQgc3lu Y2hyb25vdXNseSBhdCBjcmVhdGlvbiBidXQgdGhlIGNhbGwgdG8gZGlkTm90SGFuZGxlIGlzIG5v dCB5ZXQgZG9uZS4KKyAgICAgICAgQmVmb3JlIHRoZSBjYWxsIHRvIGRpZE5vdEhhbmRsZSBpcyBk b25lLCBhIHRpbWVvdXQgdGltZXIgaXMgZmlyaW5nIGFuZCB3aWxsIGNhbGwgZGlkTm90SGFuZGxl IGEgZmlyc3QgdGltZS4KKyAgICAgICAgVGhlIHNlY29uZCBkaWROb3RIYW5kbGUgc2hvdWxkIGJl IGEgbm8tb3AuCisKKyAgICAgICAgQ292ZXJlZCBieSBleGlzdGluZyB0ZXN0cyBhbmQgdW5mbGFr ZXMgYWJvdmUgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIv U2VydmljZVdvcmtlckZldGNoVGFzay5jcHA6CisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3Jr ZXJGZXRjaFRhc2s6OmNvbnRleHRDbG9zZWQpOgorICAgICAgICAoV2ViS2l0OjpTZXJ2aWNlV29y a2VyRmV0Y2hUYXNrOjpkaWRSZWNlaXZlUmVkaXJlY3RSZXNwb25zZSk6CisgICAgICAgIChXZWJL aXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZFJlY2VpdmVSZXNwb25zZSk6CisgICAgICAg IChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZFJlY2VpdmVEYXRhKToKKyAgICAg ICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVjZWl2ZUZvcm1EYXRhKToK KyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkRmluaXNoKToKKyAg ICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkRmFpbCk6CisgICAgICAg IChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmRpZE5vdEhhbmRsZSk6CisgICAgICAg IE1ha2Ugc3VyZSB0byBjYWxsIGRpZE5vdEhhbmRsZSBvbmx5IG9uY2UgYmFzZWQgb24gbV9pc0Rv bmUuCisgICAgICAgIChXZWJLaXQ6OlNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNhbm5vdEhhbmRs ZSk6CisgICAgICAgIERvIG5vdCBleHBvc2UgZGlkTm90SGFuZGxlIGFzIGEgcHVibGljIG1ldGhv ZC4KKyAgICAgICAgSW5zdGVhZCBleHBvc2UgY2Fubm90SGFuZGxlIHRoYXQgd2lsbCBjYWxsIGRp ZE5vdEhhbmRsZSBhc3luY2hyb25vdXNseS4KKyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtl ckZldGNoVGFzazo6Y29udGludWVGZXRjaFRhc2tXaXRoKToKKyAgICAgICAgTm8gbmVlZCB0byBz ZXQgYSB0aW1lciBpZiB3ZSB3aWxsIG5vdCBjcmVhdGUgYSBmZXRjaCBldmVudC4KKyAgICAgICAg KiBOZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suaDoK KyAgICAgICAgKFdlYktpdDo6U2VydmljZVdvcmtlckZldGNoVGFzazo6dGFrZVJlcXVlc3QpOgor ICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0 aW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6V2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZl dGNoKToKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVy VG9Db250ZXh0Q29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6OldlYlNXU2VydmVyVG9D b250ZXh0Q29ubmVjdGlvbjo6ZmV0Y2hUYXNrVGltZWRPdXQpOgorICAgICAgICBTbWFsbCByZWZh Y3RvcmluZyB0byBvbmx5IHVzZSBjb250ZXh0Q2xvc2VkIGFuZCBub3QgZXhwb3NlIHdoZXRoZXIg dGhlIHRhc2sgaXMgaGFuZGxlZCBvciBub3QuCisgICAgICAgIFRoaXMgYWxzbyBwb3RlbnRpYWxs eSBhbGxvd3MgdG8gY2FsbCBkaWROb3RIYW5kbGUgaW4gY2FzZSB0aGUgc2VydmljZSB3b3JrZXIg Y3Jhc2hlZCBiZWZvcmUgYW5zd2VyaW5nIHRoZSBmZXRjaCBldmVudC4KKwogMjAxOS0xMi0xNSAg eW91ZW5uIGZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVzZXQgY2FjaGVk IGdldFVzZXJNZWRpYSBxdWVyaWVzIHdoZW4gY2FsbGluZyBzdG9wTWVkaWFDYXB0dXJlCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2Vydmlj ZVdvcmtlckZldGNoVGFzay5jcHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZp Y2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5jcHAKaW5kZXggMWJlMDQyMGQ3NTc3OGNl ZGY2YjM0ZjQ0MGM0NmI1MGYyODQyNDM1NS4uYzIzYTFlNmU3NDAyNjc3NDYzODQxMDU4Mjk5ZjQ3 OWFiNTgzOGRlOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2 aWNlV29ya2VyL1NlcnZpY2VXb3JrZXJGZXRjaFRhc2suY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmNwcApA QCAtODksOCArODksMTQgQEAgdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpzdGFydChXZWJT V1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24mIHNlcnZpY2VXb3JrZXIKIAogdm9pZCBTZXJ2aWNl V29ya2VyRmV0Y2hUYXNrOjpjb250ZXh0Q2xvc2VkKCkKIHsKLSAgICBtX3NlcnZpY2VXb3JrZXJD b25uZWN0aW9uID0gbnVsbHB0cjsKLSAgICBkaWRGYWlsKFJlc291cmNlRXJyb3IgeyBlcnJvckRv bWFpbldlYktpdEludGVybmFsLCAwLCB7IH0sICJTZXJ2aWNlIFdvcmtlciBjb250ZXh0IGNsb3Nl ZCJfcyB9KTsKKyAgICBpZiAobV9pc0RvbmUpCisgICAgICAgIHJldHVybjsKKworICAgIGlmICht X3dhc0hhbmRsZWQpIHsKKyAgICAgICAgZGlkRmFpbChSZXNvdXJjZUVycm9yIHsgZXJyb3JEb21h aW5XZWJLaXRJbnRlcm5hbCwgMCwgeyB9LCAiU2VydmljZSBXb3JrZXIgY29udGV4dCBjbG9zZWQi X3MgfSk7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgY2Fubm90SGFuZGxlKCk7CiB9CiAK IHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3RhcnRGZXRjaCgpCkBAIC0xMDksNyArMTE1 LDExIEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6c3RhcnRGZXRjaCgpCiAKIHZvaWQg U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UoUmVzb3Vy Y2VSZXNwb25zZSYmIHJlc3BvbnNlKQogeworICAgIGlmIChtX2lzRG9uZSkKKyAgICAgICAgcmV0 dXJuOworCiAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiZGlkUmVjZWl2ZVJlZGlyZWN0UmVz cG9uc2U6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmluZygpLnV0ZjgoKS5kYXRh KCkpOworICAgIG1fd2FzSGFuZGxlZCA9IHRydWU7CiAgICAgbV90aW1lb3V0VGltZXIuc3RvcCgp OwogICAgIHNvZnRVcGRhdGVJZk5lZWRlZCgpOwogCkBAIC0xMjEsNyArMTMxLDExIEBAIHZvaWQg U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVjZWl2ZVJlZGlyZWN0UmVzcG9uc2UoUmVzb3Vy Y2VSZXNwb25zZSYmIHJlc3BvCiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVj ZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9uc2UmJiByZXNwb25zZSwgYm9vbCBuZWVkc0NvbnRp bnVlRGlkUmVjZWl2ZVJlc3BvbnNlTWVzc2FnZSkKIHsKKyAgICBpZiAobV9pc0RvbmUpCisgICAg ICAgIHJldHVybjsKKwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZFJlY2VpdmVSZXNw b25zZTogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEo KSk7CisgICAgbV93YXNIYW5kbGVkID0gdHJ1ZTsKICAgICBtX3RpbWVvdXRUaW1lci5zdG9wKCk7 CiAgICAgc29mdFVwZGF0ZUlmTmVlZGVkKCk7CiAKQEAgLTEzMSwxMiArMTQ1LDE4IEBAIHZvaWQg U2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVjZWl2ZVJlc3BvbnNlKFJlc291cmNlUmVzcG9u c2UmJiByZXNwb25zZSwgYm9vCiAKIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6ZGlkUmVj ZWl2ZURhdGEoY29uc3QgSVBDOjpEYXRhUmVmZXJlbmNlJiBkYXRhLCBpbnQ2NF90IGVuY29kZWRE YXRhTGVuZ3RoKQogeworICAgIGlmIChtX2lzRG9uZSkKKyAgICAgICAgcmV0dXJuOworCiAgICAg QVNTRVJUKCFtX3RpbWVvdXRUaW1lci5pc0FjdGl2ZSgpKTsKICAgICBzZW5kVG9DbGllbnQoTWVz c2FnZXM6OldlYlJlc291cmNlTG9hZGVyOjpEaWRSZWNlaXZlRGF0YSB7IElQQzo6U2hhcmVkQnVm ZmVyRGF0YVJlZmVyZW5jZSB7IGRhdGEuZGF0YSgpLCBkYXRhLnNpemUoKSB9LCBlbmNvZGVkRGF0 YUxlbmd0aCB9KTsKIH0KIAogdm9pZCBTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOjpkaWRSZWNlaXZl Rm9ybURhdGEoY29uc3QgSVBDOjpGb3JtRGF0YVJlZmVyZW5jZSYgZm9ybURhdGEpCiB7CisgICAg aWYgKG1faXNEb25lKQorICAgICAgICByZXR1cm47CisKICAgICBBU1NFUlQoIW1fdGltZW91dFRp bWVyLmlzQWN0aXZlKCkpOwogICAgIC8vIEZJWE1FOiBBbGxvdyBXZWJSZXNvdXJjZUxvYWRlciB0 byByZWNlaXZlIGZvcm0gZGF0YS4KIH0KQEAgLTE0NSwxMiArMTY1LDE1IEBAIHZvaWQgU2Vydmlj ZVdvcmtlckZldGNoVGFzazo6ZGlkRmluaXNoKCkKIHsKICAgICBBU1NFUlQoIW1fdGltZW91dFRp bWVyLmlzQWN0aXZlKCkpOwogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImRpZEZpbmlzaEZl dGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0cmlu ZygpLnV0ZjgoKS5kYXRhKCkpOworCisgICAgbV9pc0RvbmUgPSB0cnVlOwogICAgIG1fdGltZW91 dFRpbWVyLnN0b3AoKTsKICAgICBzZW5kVG9DbGllbnQoTWVzc2FnZXM6OldlYlJlc291cmNlTG9h ZGVyOjpEaWRGaW5pc2hSZXNvdXJjZUxvYWQgeyB7IH0gfSk7CiB9CiAKIHZvaWQgU2VydmljZVdv cmtlckZldGNoVGFzazo6ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHsKKyAg ICBtX2lzRG9uZSA9IHRydWU7CiAgICAgaWYgKG1fdGltZW91dFRpbWVyLmlzQWN0aXZlKCkpIHsK ICAgICAgICAgbV90aW1lb3V0VGltZXIuc3RvcCgpOwogICAgICAgICBzb2Z0VXBkYXRlSWZOZWVk ZWQoKTsKQEAgLTE2MiwxMiArMTg1LDI2IEBAIHZvaWQgU2VydmljZVdvcmtlckZldGNoVGFzazo6 ZGlkRmFpbChjb25zdCBSZXNvdXJjZUVycm9yJiBlcnJvcikKIHZvaWQgU2VydmljZVdvcmtlckZl dGNoVGFzazo6ZGlkTm90SGFuZGxlKCkKIHsKICAgICBSRUxFQVNFX0xPR19JRl9BTExPV0VEKCJk aWROb3RIYW5kbGVGZXRjaDogZmV0Y2hJZGVudGlmaWVyOiAlcyIsIG1fZmV0Y2hJZGVudGlmaWVy LmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICBpZiAobV9pc0RvbmUpCisgICAg ICAgIHJldHVybjsKKworICAgIG1faXNEb25lID0gdHJ1ZTsKICAgICBtX3RpbWVvdXRUaW1lci5z dG9wKCk7CiAgICAgc29mdFVwZGF0ZUlmTmVlZGVkKCk7CiAKICAgICBtX2xvYWRlci5zZXJ2aWNl V29ya2VyRGlkTm90SGFuZGxlKHRoaXMpOwogfQogCit2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRh c2s6OmNhbm5vdEhhbmRsZSgpCit7CisgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgiY2Fubm90 SGFuZGxlOiBmZXRjaElkZW50aWZpZXI6ICVzIiwgbV9mZXRjaElkZW50aWZpZXIubG9nZ2luZ1N0 cmluZygpLnV0ZjgoKS5kYXRhKCkpOworICAgIC8vIE1ha2Ugc3VyZSB3ZSBjYWxsIGRpZE5vdEhh bmRsZSBhc3luY2hyb25vdXNseSBiZWNhdXNlIGZhaWxpbmcgc3luY2hyb25vdXNseSB3b3VsZCBn ZXQgdGhlIE5ldHdvcmtSZXNvdXJjZUxvYWRlciBpbiBhIGJhZCBzdGF0ZS4KKyAgICBSdW5Mb29w OjptYWluKCkuZGlzcGF0Y2goW3dlYWtUaGlzID0gbWFrZVdlYWtQdHIodGhpcyldIHsKKyAgICAg ICAgaWYgKHdlYWtUaGlzKQorICAgICAgICAgICAgd2Vha1RoaXMtPmRpZE5vdEhhbmRsZSgpOwor ICAgIH0pOworfQorCiB2b2lkIFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s6OmNhbmNlbEZyb21DbGll bnQoKQogewogICAgIFJFTEVBU0VfTE9HX0lGX0FMTE9XRUQoImNhbmNlbEZyb21DbGllbnQ6IGZl dGNoSWRlbnRpZmllcjogJXMiLCBtX2ZldGNoSWRlbnRpZmllci5sb2dnaW5nU3RyaW5nKCkudXRm OCgpLmRhdGEoKSk7CkBAIC0xODEsMTEgKzIxOCwxMSBAQCB2b2lkIFNlcnZpY2VXb3JrZXJGZXRj aFRhc2s6OmNvbnRpbnVlRGlkUmVjZWl2ZUZldGNoUmVzcG9uc2UoKQogCiB2b2lkIFNlcnZpY2VX b3JrZXJGZXRjaFRhc2s6OmNvbnRpbnVlRmV0Y2hUYXNrV2l0aChSZXNvdXJjZVJlcXVlc3QmJiBy ZXF1ZXN0KQogewotICAgIG1fdGltZW91dFRpbWVyLnN0YXJ0T25lU2hvdChtX2xvYWRlci5jb25u ZWN0aW9uVG9XZWJQcm9jZXNzKCkubmV0d29ya1Byb2Nlc3MoKS5zZXJ2aWNlV29ya2VyRmV0Y2hU aW1lb3V0KCkpOwogICAgIGlmICghbV9zZXJ2aWNlV29ya2VyQ29ubmVjdGlvbikgewogICAgICAg ICBtX2xvYWRlci5zZXJ2aWNlV29ya2VyRGlkTm90SGFuZGxlKHRoaXMpOwogICAgICAgICByZXR1 cm47CiAgICAgfQorICAgIG1fdGltZW91dFRpbWVyLnN0YXJ0T25lU2hvdChtX2xvYWRlci5jb25u ZWN0aW9uVG9XZWJQcm9jZXNzKCkubmV0d29ya1Byb2Nlc3MoKS5zZXJ2aWNlV29ya2VyRmV0Y2hU aW1lb3V0KCkpOwogICAgIG1fY3VycmVudFJlcXVlc3QgPSBXVEZNb3ZlKHJlcXVlc3QpOwogICAg IHN0YXJ0RmV0Y2goKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nl c3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmggYi9Tb3VyY2UvV2ViS2l0 L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvU2VydmljZVdvcmtlckZldGNoVGFzay5oCmlu ZGV4IDVkYjkzYzFiMGI2ZGYyYjFmOTAyMWRkZjkxYTczZjE2MjcwNmMxOTMuLjEyYWE1NDZjNThh MzUyM2E0MTBiYmVkODM4NjYyYzNmZDc4NmM2MjMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9TZXJ2aWNlV29ya2VyRmV0Y2hUYXNrLmgKKysr IGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1NlcnZpY2VXb3Jr ZXJGZXRjaFRhc2suaApAQCAtNjEsNyArNjEsNiBAQCBwdWJsaWM6CiAKICAgICB2b2lkIHN0YXJ0 KFdlYlNXU2VydmVyVG9Db250ZXh0Q29ubmVjdGlvbiYpOwogICAgIHZvaWQgY2FuY2VsRnJvbUNs aWVudCgpOwotICAgIHZvaWQgZmFpbChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9yJiBlcnJv cikgeyBkaWRGYWlsKGVycm9yKTsgfQogICAgIHZvaWQgZGlkUmVjZWl2ZU1lc3NhZ2UoSVBDOjpD b25uZWN0aW9uJiwgSVBDOjpEZWNvZGVyJik7CiAKICAgICB2b2lkIGNvbnRpbnVlRGlkUmVjZWl2 ZUZldGNoUmVzcG9uc2UoKTsKQEAgLTcwLDExICs2OSw5IEBAIHB1YmxpYzoKICAgICBXZWJDb3Jl OjpGZXRjaElkZW50aWZpZXIgZmV0Y2hJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9mZXRj aElkZW50aWZpZXI7IH0KICAgICBXZWJDb3JlOjpTZXJ2aWNlV29ya2VySWRlbnRpZmllciBzZXJ2 aWNlV29ya2VySWRlbnRpZmllcigpIGNvbnN0IHsgcmV0dXJuIG1fc2VydmljZVdvcmtlcklkZW50 aWZpZXI7IH0KIAotICAgIHZvaWQgZGlkTm90SGFuZGxlKCk7Ci0KICAgICBXZWJDb3JlOjpSZXNv dXJjZVJlcXVlc3QgdGFrZVJlcXVlc3QoKSB7IHJldHVybiBXVEZNb3ZlKG1fY3VycmVudFJlcXVl c3QpOyB9Ci0gICAgYm9vbCB3YXNIYW5kbGVkKCkgY29uc3QgeyByZXR1cm4gbV93YXNIYW5kbGVk OyB9CiAKKyAgICB2b2lkIGNhbm5vdEhhbmRsZSgpOwogICAgIHZvaWQgY29udGV4dENsb3NlZCgp OwogCiBwcml2YXRlOgpAQCAtODQsNiArODEsNyBAQCBwcml2YXRlOgogICAgIHZvaWQgZGlkUmVj ZWl2ZUZvcm1EYXRhKGNvbnN0IElQQzo6Rm9ybURhdGFSZWZlcmVuY2UmKTsKICAgICB2b2lkIGRp ZEZpbmlzaCgpOwogICAgIHZvaWQgZGlkRmFpbChjb25zdCBXZWJDb3JlOjpSZXNvdXJjZUVycm9y Jik7CisgICAgdm9pZCBkaWROb3RIYW5kbGUoKTsKIAogICAgIHZvaWQgc3RhcnRGZXRjaCgpOwog CkBAIC0xMDEsNiArOTksNyBAQCBwcml2YXRlOgogICAgIFdlYkNvcmU6OlJlc291cmNlUmVxdWVz dCBtX2N1cnJlbnRSZXF1ZXN0OwogICAgIFdlYkNvcmU6OlRpbWVyIG1fdGltZW91dFRpbWVyOwog ICAgIGJvb2wgbV93YXNIYW5kbGVkIHsgZmFsc2UgfTsKKyAgICBib29sIG1faXNEb25lIHsgZmFs c2UgfTsKICAgICBXZWJDb3JlOjpTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmllciBt X3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb25JZGVudGlmaWVyOwogICAgIGJvb2wgbV9zaG91bGRT b2Z0VXBkYXRlIHsgZmFsc2UgfTsKIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmNwcCBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rp b24uY3BwCmluZGV4IGE1OTExNGNhMjY4ZTlhZjQzNTlhYzI5MjE0Yjg0MGE5MGY5M2IxNDEuLjI1 ODFlMTIzNjZlOTdjOGIzZWQ1MzY5YjljNmYxMzMyZmQ4NGViODYgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rp b24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9X ZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwCkBAIC0xOTcsMTkgKzE5NywxOSBAQCB2b2lkIFdlYlNX U2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaChTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrJiB0YXNr LCBTV1NlcnZlcldvcgogICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgIGlmICghd2Vha1Ro aXMpIHsKLSAgICAgICAgICAgIHRhc2stPmRpZE5vdEhhbmRsZSgpOworICAgICAgICAgICAgdGFz ay0+Y2Fubm90SGFuZGxlKCk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KIAogICAg ICAgICBpZiAoIXN1Y2Nlc3MpIHsKICAgICAgICAgICAgIFNXU0VSVkVSQ09OTkVDVElPTl9SRUxF QVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzdGFydEZldGNoOiBmZXRjaElkZW50aWZpZXI6ICVz IERpZE5vdEhhbmRsZSBiZWNhdXNlIHdvcmtlciBkaWQgbm90IGJlY29tZSBhY3RpdmF0ZWQiLCB0 YXNrLT5mZXRjaElkZW50aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0g ICAgICAgICAgICB0YXNrLT5kaWROb3RIYW5kbGUoKTsKKyAgICAgICAgICAgIHRhc2stPmNhbm5v dEhhbmRsZSgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CiAKICAgICAgICAgYXV0 byogd29ya2VyID0gc2VydmVyKCkud29ya2VyQnlJRCh0YXNrLT5zZXJ2aWNlV29ya2VySWRlbnRp ZmllcigpKTsKICAgICAgICAgaWYgKCF3b3JrZXIgfHwgd29ya2VyLT5oYXNUaW1lZE91dEFueUZl dGNoVGFza3MoKSkgewotICAgICAgICAgICAgdGFzay0+ZGlkTm90SGFuZGxlKCk7CisgICAgICAg ICAgICB0YXNrLT5jYW5ub3RIYW5kbGUoKTsKICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAg fQogCkBAIC0yMjIsMTMgKzIyMiwxMyBAQCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3Rh cnRGZXRjaChTZXJ2aWNlV29ya2VyRmV0Y2hUYXNrJiB0YXNrLCBTV1NlcnZlcldvcgogICAgICAg ICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAgIAogICAgICAgICAgICAgaWYgKCF3ZWFrVGhp cykgewotICAgICAgICAgICAgICAgIHRhc2stPmRpZE5vdEhhbmRsZSgpOworICAgICAgICAgICAg ICAgIHRhc2stPmNhbm5vdEhhbmRsZSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAg ICAgICAgIH0KIAogICAgICAgICAgICAgaWYgKCFjb250ZXh0Q29ubmVjdGlvbikgewogICAgICAg ICAgICAgICAgIFNXU0VSVkVSQ09OTkVDVElPTl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VE KCJzdGFydEZldGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIERpZE5vdEhhbmRsZSBiZWNhdXNlIGZh aWxlZCB0byBydW4gc2VydmljZSB3b3JrZXIiLCB0YXNrLT5mZXRjaElkZW50aWZpZXIoKS5sb2dn aW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSk7Ci0gICAgICAgICAgICAgICAgdGFzay0+ZGlkTm90 SGFuZGxlKCk7CisgICAgICAgICAgICAgICAgdGFzay0+Y2Fubm90SGFuZGxlKCk7CiAgICAgICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICAgICAgfQogICAgICAgICAgICAgU1dTRVJWRVJDT05O RUNUSU9OX1JFTEVBU0VfTE9HX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2g6IFN0YXJ0aW5nIGZldGNo ICVzIHZpYSBzZXJ2aWNlIHdvcmtlciAlcyIsIHRhc2stPmZldGNoSWRlbnRpZmllcigpLmxvZ2dp bmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpLCB0YXNrLT5zZXJ2aWNlV29ya2VySWRlbnRpZmllcigp LmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKQEAgLTI0MiwxMCArMjQyLDcgQEAgdm9p ZCBXZWJTV1NlcnZlckNvbm5lY3Rpb246OnN0YXJ0RmV0Y2goU2VydmljZVdvcmtlckZldGNoVGFz ayYgdGFzaywgU1dTZXJ2ZXJXb3IKICAgICB9CiAKICAgICBBU1NFUlQod29ya2VyLnN0YXRlKCkg PT0gU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpOwotICAgIC8vIE1ha2Ugc3VyZSB3ZSBz dGFydCB0aGUgZmV0Y2ggYXN5bmNocm9ub3VzbHkgYmVjYXVzZSBmYWlsaW5nIHN5bmNocm9ub3Vz bHkgd291bGQgZ2V0IHRoZSBOZXR3b3JrUmVzb3VyY2VMb2FkZXIgaW4gYSBiYWQgc3RhdGUuCi0g ICAgUnVuTG9vcDo6bWFpbigpLmRpc3BhdGNoKFtydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNo ID0gV1RGTW92ZShydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKV0oKSBtdXRhYmxlIHsKLSAg ICAgICAgcnVuU2VydmVyV29ya2VyQW5kU3RhcnRGZXRjaCh0cnVlKTsKLSAgICB9KTsKKyAgICBy dW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKHRydWUpOwogfQogCiB2b2lkIFdlYlNXU2VydmVy Q29ubmVjdGlvbjo6cG9zdE1lc3NhZ2VUb1NlcnZpY2VXb3JrZXIoU2VydmljZVdvcmtlcklkZW50 aWZpZXIgZGVzdGluYXRpb25JZGVudGlmaWVyLCBNZXNzYWdlV2l0aE1lc3NhZ2VQb3J0cyYmIG1l c3NhZ2UsIGNvbnN0IFNlcnZpY2VXb3JrZXJPckNsaWVudElkZW50aWZpZXImIHNvdXJjZUlkZW50 aWZpZXIpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VX b3JrZXIvV2ViU1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlclRvQ29udGV4dENvbm5lY3Rp b24uY3BwCmluZGV4IDRmMmJmMWI0OGE2MjNlZjU1ZWNiMmJlNzZjNjgyOTg3OTUzYjZlM2UuLmUx ZDVmNWUzZWQ5YTYxOTc3MjIzMDZmNGNlMjJkOGI5MTRjYWM4ZDkgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlclRvQ29udGV4 dENvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2Vydmlj ZVdvcmtlci9XZWJTV1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24uY3BwCkBAIC0xNzcsMTIgKzE3 Nyw4IEBAIHZvaWQgV2ViU1dTZXJ2ZXJUb0NvbnRleHRDb25uZWN0aW9uOjpmZXRjaFRhc2tUaW1l ZE91dChTZXJ2aWNlV29ya2VySWRlbnRpZmllciBzCiAgICAgfQogCiAgICAgLy8gU2lnbmFsIGxv YWQgZmFpbHVyZSBmb3IgdGhlbQotICAgIGZvciAoYXV0byogZmV0Y2hUYXNrIDogZmV0Y2hlcykg ewotICAgICAgICBpZiAoZmV0Y2hUYXNrLT53YXNIYW5kbGVkKCkpCi0gICAgICAgICAgICBmZXRj aFRhc2stPmZhaWwoeyBlcnJvckRvbWFpbldlYktpdEludGVybmFsLCAwLCB7IH0sICJTZXJ2aWNl IFdvcmtlciBjb250ZXh0IGNsb3NlZCJfcyB9KTsKLSAgICAgICAgZWxzZQotICAgICAgICAgICAg ZmV0Y2hUYXNrLT5kaWROb3RIYW5kbGUoKTsKLSAgICB9CisgICAgZm9yIChhdXRvKiBmZXRjaFRh c2sgOiBmZXRjaGVzKQorICAgICAgICBmZXRjaFRhc2stPmNvbnRleHRDbG9zZWQoKTsKIAogICAg IGlmIChtX3NlcnZlcikgewogICAgICAgICBpZiAoYXV0byogd29ya2VyID0gbV9zZXJ2ZXItPndv cmtlckJ5SUQoc2VydmljZVdvcmtlcklkZW50aWZpZXIpKSB7Cg==