210795 2020-04-21 07:31:38 -0700 Simplify SWServerWorker::whenActivated logic 2020-04-22 04:49:13 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen cdumez ggaren webkit-bug-importer oldest_to_newest 1643868 0 youennf 2020-04-21 07:31:38 -0700 Simplify SWServerWorker::whenActivated logic 1643870 1 397081 youennf 2020-04-21 07:38:40 -0700 Created attachment 397081 Patch 1644264 2 ews-feeder 2020-04-22 04:48:49 -0700 Committed r260507: <https://trac.webkit.org/changeset/260507> All reviewed patches have been landed. Closing bug and clearing flags on attachment 397081. 1644265 3 webkit-bug-importer 2020-04-22 04:49:13 -0700 <rdar://problem/62175839> 397081 2020-04-21 07:38:40 -0700 2020-04-22 04:48:49 -0700 Patch bug-210795-20200421163838.patch text/plain 9057 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjYwMzU5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjAxOWYzZWJlZmRmYzJk NjAxNTYyMzQzYzkzZTYyYWU0MWEzYTliNi4uMzc5OWY3MmQ0YTE4MDIxNTE0Njc5YmU5MDFhMDkw M2FjMTAyODBmMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIwLTA0LTIxICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBTaW1wbGlmeSBTV1NlcnZl cldvcmtlcjo6d2hlbkFjdGl2YXRlZCBsb2dpYworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjEwNzk1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgSW1wcm92ZSBsb2dnaW5nIGFuZCBlbnN1cmUgd2hlbkFjdGl2 YXRlZCBjYW4gYmUgY2FsbGVkIHdoYXRldmVyIHRoZSB3b3JrZXIgc3RhdGUgaXMuCisgICAgICAg IE5vIGNoYW5nZSBvZiBiZWhhdmlvci4KKworICAgICAgICAqIHdvcmtlcnMvc2VydmljZS9zZXJ2 ZXIvU1dTZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6OmRpZEZpbmlzaElu c3RhbGwpOgorICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6OmZpcmVJbnN0YWxsRXZlbnQpOgor ICAgICAgICAoV2ViQ29yZTo6U1dTZXJ2ZXI6OmZpcmVBY3RpdmF0ZUV2ZW50KToKKyAgICAgICAg KiB3b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyV29ya2VyLmNwcDoKKyAgICAgICAgKFdl YkNvcmU6OlNXU2VydmVyV29ya2VyOjp3aGVuQWN0aXZhdGVkKToKKwogMjAyMC0wNC0yMCAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgU2FmYXJpIGRvZXNuJ3Qg YXBwbHkgZnJhbWVSYXRlIGxpbWl0IHdoZW4gcmVxdWVzdCBzdHJlYW0gZnJvbSBDYW1lcmEKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9DaGFuZ2VM b2cKaW5kZXggNzI4ZTU1MjFiMDZkNDBkZTMzZjI3YjQyN2JlMmNiYmVkYjRiM2UxOC4uMGUzNjVk YWI3N2Y2MDc0MDZkZmU3MTcwOWY4OTk0ZGViNzcxZjU0OSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKQEAgLTEsMyArMSwx NyBAQAorMjAyMC0wNC0yMSAgWW91ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAg ICAgICAgU2ltcGxpZnkgU1dTZXJ2ZXJXb3JrZXI6OndoZW5BY3RpdmF0ZWQgbG9naWMKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIxMDc5NQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEltcHJvdmUgbG9nZ2lu ZyBhbmQgdXBkYXRlIGNvZGUgYWNjb3JkaW5nIHdoZW5BY3RpdmF0ZWQgaW1wbGVtZW50YXRpb24u CisgICAgICAgIEFkZCBhbiBlYXJseSBjaGVjayBmb3IgdGltZW91dHMgc28gdGhhdCB3ZSByZXR1 cm4gZWFybGllciBpbiB0aGF0IGNhc2UuCisKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9TZXJ2 aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHA6CisgICAgICAgIChXZWJLaXQ6Oldl YlNXU2VydmVyQ29ubmVjdGlvbjo6Y3JlYXRlRmV0Y2hUYXNrKToKKyAgICAgICAgKFdlYktpdDo6 V2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpzdGFydEZldGNoKToKKwogMjAyMC0wNC0yMCAgUGFibG8g U2FhdmVkcmEgIDxwc2FhdmVkcmFAaWdhbGlhLmNvbT4KIAogICAgICAgICBbR1RLXVtXUEVdIGxv d1dhdGVybWFya1BhZ2VzKCkgaW4gTWVtb3J5UHJlc3N1cmVNb25pdG9yLmNwcCBvbmx5IHNlYXJj aGVzIHRoZSAibG93IiB2YWx1ZSBpbnNpZGUgdGhlIGZpcnN0ICJOb2RlIiBzZWN0aW9uCmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyLmNw cCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCmlu ZGV4IDllMzUyZmY5ZDNkMmFhMjE4ZTlkNjI2ZTdlZjU5MTJhNDg4Mjk4OWEuLmJmYzE1NzIxMTZj ZjI5NjdhYzg1NjYzNTRmZTQ5NDc0ODdkY2UyNWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXIuY3BwCkBAIC01MjEsMTQgKzUyMSwxMSBA QCB2b2lkIFNXU2VydmVyOjp0ZXJtaW5hdGVQcmVpbnN0YWxsYXRpb25Xb3JrZXIoU1dTZXJ2ZXJX b3JrZXImIHdvcmtlcikKIAogdm9pZCBTV1NlcnZlcjo6ZGlkRmluaXNoSW5zdGFsbChjb25zdCBP cHRpb25hbDxTZXJ2aWNlV29ya2VySm9iRGF0YUlkZW50aWZpZXI+JiBqb2JEYXRhSWRlbnRpZmll ciwgU1dTZXJ2ZXJXb3JrZXImIHdvcmtlciwgYm9vbCB3YXNTdWNjZXNzZnVsKQogeworICAgIFJF TEVBU0VfTE9HKFNlcnZpY2VXb3JrZXIsICIlcCAtIFNXU2VydmVyOjpkaWRGaW5pc2hJbnN0YWxs OiBGaW5pc2hlZCBpbnN0YWxsIGZvciBzZXJ2aWNlIHdvcmtlciAlbGx1LCBzdWNjZXNzIGlzICVk IiwgdGhpcywgd29ya2VyLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpLCB3YXNTdWNjZXNzZnVsKTsK KwogICAgIGlmICgham9iRGF0YUlkZW50aWZpZXIpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlm ICh3YXNTdWNjZXNzZnVsKQotICAgICAgICBSRUxFQVNFX0xPRyhTZXJ2aWNlV29ya2VyLCAiJXAg LSBTV1NlcnZlcjo6ZGlkRmluaXNoSW5zdGFsbDogU3VjY2Vzc2Z1bHkgZmluaXNoZWQgU1cgaW5z dGFsbCBmb3Igam9iICVzIiwgdGhpcywgam9iRGF0YUlkZW50aWZpZXItPmxvZ2dpbmdTdHJpbmco KS51dGY4KCkuZGF0YSgpKTsKLSAgICBlbHNlCi0gICAgICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNl cnZpY2VXb3JrZXIsICIlcCAtIFNXU2VydmVyOjpkaWRGaW5pc2hJbnN0YWxsOiBGYWlsZWQgU1cg aW5zdGFsbCBmb3Igam9iICVzIiwgdGhpcywgam9iRGF0YUlkZW50aWZpZXItPmxvZ2dpbmdTdHJp bmcoKS51dGY4KCkuZGF0YSgpKTsKLQogICAgIGlmIChhdXRvKiBqb2JRdWV1ZSA9IG1fam9iUXVl dWVzLmdldCh3b3JrZXIucmVnaXN0cmF0aW9uS2V5KCkpKQogICAgICAgICBqb2JRdWV1ZS0+ZGlk RmluaXNoSW5zdGFsbCgqam9iRGF0YUlkZW50aWZpZXIsIHdvcmtlciwgd2FzU3VjY2Vzc2Z1bCk7 CiB9CkBAIC03OTMsMTAgKzc5MCwxMSBAQCB2b2lkIFNXU2VydmVyOjpmaXJlSW5zdGFsbEV2ZW50 KFNXU2VydmVyV29ya2VyJiB3b3JrZXIpCiB7CiAgICAgYXV0byogY29udGV4dENvbm5lY3Rpb24g PSB3b3JrZXIuY29udGV4dENvbm5lY3Rpb24oKTsKICAgICBpZiAoIWNvbnRleHRDb25uZWN0aW9u KSB7Ci0gICAgICAgIExPR19FUlJPUigiUmVxdWVzdCB0byBmaXJlIGluc3RhbGwgZXZlbnQgb24g YSB3b3JrZXIgd2hvc2UgY29udGV4dCBjb25uZWN0aW9uIGRvZXMgbm90IGV4aXN0Iik7CisgICAg ICAgIFJFTEVBU0VfTE9HX0VSUk9SKFNlcnZpY2VXb3JrZXIsICJSZXF1ZXN0IHRvIGZpcmUgaW5z dGFsbCBldmVudCBvbiBhIHdvcmtlciB3aG9zZSBjb250ZXh0IGNvbm5lY3Rpb24gZG9lcyBub3Qg ZXhpc3QiKTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFJFTEVBU0VfTE9HKFNlcnZp Y2VXb3JrZXIsICIlcCAtIFNXU2VydmVyOjpmaXJlSW5zdGFsbEV2ZW50IG9uIHdvcmtlciAlbGx1 IiwgdGhpcywgd29ya2VyLmlkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICBjb250ZXh0Q29u bmVjdGlvbi0+ZmlyZUluc3RhbGxFdmVudCh3b3JrZXIuaWRlbnRpZmllcigpKTsKIH0KIApAQCAt ODA0LDEwICs4MDIsMTEgQEAgdm9pZCBTV1NlcnZlcjo6ZmlyZUFjdGl2YXRlRXZlbnQoU1dTZXJ2 ZXJXb3JrZXImIHdvcmtlcikKIHsKICAgICBhdXRvKiBjb250ZXh0Q29ubmVjdGlvbiA9IHdvcmtl ci5jb250ZXh0Q29ubmVjdGlvbigpOwogICAgIGlmICghY29udGV4dENvbm5lY3Rpb24pIHsKLSAg ICAgICAgTE9HX0VSUk9SKCJSZXF1ZXN0IHRvIGZpcmUgaW5zdGFsbCBldmVudCBvbiBhIHdvcmtl ciB3aG9zZSBjb250ZXh0IGNvbm5lY3Rpb24gZG9lcyBub3QgZXhpc3QiKTsKKyAgICAgICAgUkVM RUFTRV9MT0dfRVJST1IoU2VydmljZVdvcmtlciwgIlJlcXVlc3QgdG8gZmlyZSBhY3RpdmF0ZSBl dmVudCBvbiBhIHdvcmtlciB3aG9zZSBjb250ZXh0IGNvbm5lY3Rpb24gZG9lcyBub3QgZXhpc3Qi KTsKICAgICAgICAgcmV0dXJuOwogICAgIH0KIAorICAgIFJFTEVBU0VfTE9HKFNlcnZpY2VXb3Jr ZXIsICIlcCAtIFNXU2VydmVyOjpmaXJlQWN0aXZhdGVFdmVudCBvbiB3b3JrZXIgJWxsdSIsIHRo aXMsIHdvcmtlci5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAgY29udGV4dENvbm5lY3Rp b24tPmZpcmVBY3RpdmF0ZUV2ZW50KHdvcmtlci5pZGVudGlmaWVyKCkpOwogfQogCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS93b3JrZXJzL3NlcnZpY2Uvc2VydmVyL1NXU2VydmVyV29ya2Vy LmNwcCBiL1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJXb3Jr ZXIuY3BwCmluZGV4IDExMTBkNjcyZTg0ZjI5OGU3YTRiOGVjMDJkMTNkMjgyZjcyOTFkNTMuLjkw MTU4NDY5NDNkMTcxNzA0ZjA0NzM2MGNiN2E0NmY0YTQ4NzE1Y2EgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJXb3JrZXIuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3dvcmtlcnMvc2VydmljZS9zZXJ2ZXIvU1dTZXJ2ZXJXb3JrZXIuY3Bw CkBAIC0yNjYsMTIgKzI2NiwxMiBAQCB2b2lkIFNXU2VydmVyV29ya2VyOjpzZXRIYXNQZW5kaW5n RXZlbnRzKGJvb2wgaGFzUGVuZGluZ0V2ZW50cykKIAogdm9pZCBTV1NlcnZlcldvcmtlcjo6d2hl bkFjdGl2YXRlZChDb21wbGV0aW9uSGFuZGxlcjx2b2lkKGJvb2wpPiYmIGhhbmRsZXIpCiB7Ci0g ICAgaWYgKHN0YXRlKCkgPT0gU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpIHsKLSAgICAg ICAgaGFuZGxlcih0cnVlKTsKKyAgICBpZiAoc3RhdGUoKSA9PSBTZXJ2aWNlV29ya2VyU3RhdGU6 OkFjdGl2YXRpbmcpIHsKKyAgICAgICAgbV93aGVuQWN0aXZhdGVkSGFuZGxlcnMuYXBwZW5kKFdU Rk1vdmUoaGFuZGxlcikpOwogICAgICAgICByZXR1cm47CiAgICAgfQotICAgIEFTU0VSVChzdGF0 ZSgpID09IFNlcnZpY2VXb3JrZXJTdGF0ZTo6QWN0aXZhdGluZyk7Ci0gICAgbV93aGVuQWN0aXZh dGVkSGFuZGxlcnMuYXBwZW5kKFdURk1vdmUoaGFuZGxlcikpOworICAgIEFTU0VSVChzdGF0ZSgp ID09IFNlcnZpY2VXb3JrZXJTdGF0ZTo6QWN0aXZhdGVkKTsKKyAgICBoYW5kbGVyKHN0YXRlKCkg PT0gU2VydmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpOwogfQogCiB2b2lkIFNXU2VydmVyV29y a2VyOjpzZXRTdGF0ZShTZXJ2aWNlV29ya2VyU3RhdGUgc3RhdGUpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1NlcnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0 aW9uLmNwcCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJT V1NlcnZlckNvbm5lY3Rpb24uY3BwCmluZGV4IDYwMjNmZjRlNzI3YjIwNjFiOTRjYTAzNDllODRl ZjQ3MTlhY2Q5OWIuLjAzNGVjNmRhNTI0MTU1YzRkNTBlZDBhZmIyMzA4ZjI4ZDZhZjhmMzIgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJT V1NlcnZlckNvbm5lY3Rpb24uY3BwCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv U2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwCkBAIC0xNzksNyArMTc5LDcg QEAgc3RkOjp1bmlxdWVfcHRyPFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s+IFdlYlNXU2VydmVyQ29u bmVjdGlvbjo6Y3JlYXRlRmV0Y2hUYXNrKE4KIAogICAgIGF1dG8qIHdvcmtlciA9IHNlcnZlcigp LmFjdGl2ZVdvcmtlckZyb21SZWdpc3RyYXRpb25JRCgqc2VydmljZVdvcmtlclJlZ2lzdHJhdGlv bklkZW50aWZpZXIpOwogICAgIGlmICghd29ya2VyKSB7Ci0gICAgICAgIFNXU0VSVkVSQ09OTkVD VElPTl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzdGFydEZldGNoOiBEaWROb3RIYW5k bGUgYmVjYXVzZSBubyBhY3RpdmUgd29ya2VyICVzIiwgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlv bklkZW50aWZpZXItPmxvZ2dpbmdTdHJpbmcoKS51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgU1dT RVJWRVJDT05ORUNUSU9OX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2g6 IERpZE5vdEhhbmRsZSBiZWNhdXNlIG5vIGFjdGl2ZSB3b3JrZXIgZm9yIHJlZ2lzdHJhdGlvbiAl bGx1Iiwgc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50aWZpZXItPnRvVUludDY0KCkpOwog ICAgICAgICByZXR1cm4gbnVsbHB0cjsKICAgICB9CiAKQEAgLTE5MSw2ICsxOTEsMTEgQEAgc3Rk Ojp1bmlxdWVfcHRyPFNlcnZpY2VXb3JrZXJGZXRjaFRhc2s+IFdlYlNXU2VydmVyQ29ubmVjdGlv bjo6Y3JlYXRlRmV0Y2hUYXNrKE4KICAgICAgICAgcmV0dXJuIG51bGxwdHI7CiAgICAgfQogCisg ICAgaWYgKHdvcmtlci0+aGFzVGltZWRPdXRBbnlGZXRjaFRhc2tzKCkpIHsKKyAgICAgICAgU1dT RVJWRVJDT05ORUNUSU9OX1JFTEVBU0VfTE9HX0VSUk9SX0lGX0FMTE9XRUQoInN0YXJ0RmV0Y2g6 IERpZE5vdEhhbmRsZSBiZWNhdXNlIHdvcmtlciAlbGx1IGhhcyBzb21lIHRpbWVvdXRzIiwgd29y a2VyLT5pZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CisgICAgICAgIHJldHVybiBudWxscHRyOwor ICAgIH0KKwogICAgIGF1dG8gdGFzayA9IG1ha2VVbmlxdWU8U2VydmljZVdvcmtlckZldGNoVGFz az4oKnRoaXMsIGxvYWRlciwgUmVzb3VyY2VSZXF1ZXN0IHsgcmVxdWVzdCB9LCBpZGVudGlmaWVy KCksIHdvcmtlci0+aWRlbnRpZmllcigpLCAqc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbklkZW50 aWZpZXIsIHNob3VsZFNvZnRVcGRhdGUpOwogICAgIHN0YXJ0RmV0Y2goKnRhc2ssICp3b3JrZXIp OwogICAgIHJldHVybiB0YXNrOwpAQCAtMjA4LDcgKzIxMyw3IEBAIHZvaWQgV2ViU1dTZXJ2ZXJD b25uZWN0aW9uOjpzdGFydEZldGNoKFNlcnZpY2VXb3JrZXJGZXRjaFRhc2smIHRhc2ssIFNXU2Vy dmVyV29yCiAgICAgICAgIH0KIAogICAgICAgICBpZiAoIXN1Y2Nlc3MpIHsKLSAgICAgICAgICAg IFNXU0VSVkVSQ09OTkVDVElPTl9SRUxFQVNFX0xPR19FUlJPUl9JRl9BTExPV0VEKCJzdGFydEZl dGNoOiBmZXRjaElkZW50aWZpZXI6ICVzIERpZE5vdEhhbmRsZSBiZWNhdXNlIHdvcmtlciBkaWQg bm90IGJlY29tZSBhY3RpdmF0ZWQiLCB0YXNrLT5mZXRjaElkZW50aWZpZXIoKS5sb2dnaW5nU3Ry aW5nKCkudXRmOCgpLmRhdGEoKSk7CisgICAgICAgICAgICBTV1NFUlZFUkNPTk5FQ1RJT05fUkVM RUFTRV9MT0dfRVJST1JfSUZfQUxMT1dFRCgic3RhcnRGZXRjaDogZmV0Y2hJZGVudGlmaWVyOiAl bGx1IERpZE5vdEhhbmRsZSBiZWNhdXNlIHdvcmtlciBkaWQgbm90IGJlY29tZSBhY3RpdmF0ZWQi LCB0YXNrLT5mZXRjaElkZW50aWZpZXIoKS50b1VJbnQ2NCgpKTsKICAgICAgICAgICAgIHRhc2st PmNhbm5vdEhhbmRsZSgpOwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICB9CkBAIC0yMzcs MTggKzI0MiwxMiBAQCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6c3RhcnRGZXRjaChTZXJ2 aWNlV29ya2VyRmV0Y2hUYXNrJiB0YXNrLCBTV1NlcnZlcldvcgogICAgICAgICAgICAgICAgIHRh c2stPmNhbm5vdEhhbmRsZSgpOwogICAgICAgICAgICAgICAgIHJldHVybjsKICAgICAgICAgICAg IH0KLSAgICAgICAgICAgIFNXU0VSVkVSQ09OTkVDVElPTl9SRUxFQVNFX0xPR19JRl9BTExPV0VE KCJzdGFydEZldGNoOiBTdGFydGluZyBmZXRjaCAlcyB2aWEgc2VydmljZSB3b3JrZXIgJXMiLCB0 YXNrLT5mZXRjaElkZW50aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEoKSwgdGFz ay0+c2VydmljZVdvcmtlcklkZW50aWZpZXIoKS5sb2dnaW5nU3RyaW5nKCkudXRmOCgpLmRhdGEo KSk7CisgICAgICAgICAgICBTV1NFUlZFUkNPTk5FQ1RJT05fUkVMRUFTRV9MT0dfSUZfQUxMT1dF RCgic3RhcnRGZXRjaDogU3RhcnRpbmcgZmV0Y2ggJWxsdSB2aWEgc2VydmljZSB3b3JrZXIgJWxs dSIsIHRhc2stPmZldGNoSWRlbnRpZmllcigpLnRvVUludDY0KCksIHRhc2stPnNlcnZpY2VXb3Jr ZXJJZGVudGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAgICAgICAgICBzdGF0aWNfY2FzdDxXZWJT V1NlcnZlclRvQ29udGV4dENvbm5lY3Rpb24mPigqY29udGV4dENvbm5lY3Rpb24pLnN0YXJ0RmV0 Y2goKnRhc2spOwogICAgICAgICB9KTsKICAgICB9OwotICAgIAotICAgIGlmICh3b3JrZXIuc3Rh dGUoKSA9PSBTZXJ2aWNlV29ya2VyU3RhdGU6OkFjdGl2YXRpbmcpIHsKLSAgICAgICAgd29ya2Vy LndoZW5BY3RpdmF0ZWQoV1RGTW92ZShydW5TZXJ2ZXJXb3JrZXJBbmRTdGFydEZldGNoKSk7Ci0g ICAgICAgIHJldHVybjsKLSAgICB9CiAKLSAgICBBU1NFUlQod29ya2VyLnN0YXRlKCkgPT0gU2Vy dmljZVdvcmtlclN0YXRlOjpBY3RpdmF0ZWQpOwotICAgIHJ1blNlcnZlcldvcmtlckFuZFN0YXJ0 RmV0Y2godHJ1ZSk7CisgICAgd29ya2VyLndoZW5BY3RpdmF0ZWQoV1RGTW92ZShydW5TZXJ2ZXJX b3JrZXJBbmRTdGFydEZldGNoKSk7CiB9CiAKIHZvaWQgV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpw b3N0TWVzc2FnZVRvU2VydmljZVdvcmtlcihTZXJ2aWNlV29ya2VySWRlbnRpZmllciBkZXN0aW5h dGlvbklkZW50aWZpZXIsIE1lc3NhZ2VXaXRoTWVzc2FnZVBvcnRzJiYgbWVzc2FnZSwgY29uc3Qg U2VydmljZVdvcmtlck9yQ2xpZW50SWRlbnRpZmllciYgc291cmNlSWRlbnRpZmllcikK