234507 2021-12-20 03:00:42 -0800 Use requester when calling updateRequestAndAddExtraFields 2021-12-22 02:14:26 -0800 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 youennf youennf achristensen bfulgham cdumez ews-watchlist japhet webkit-bug-importer oldest_to_newest 1825564 0 youennf 2021-12-20 03:00:42 -0800 Use requester when calling updateRequestAndAddExtraFields 1825565 1 youennf 2021-12-20 03:00:55 -0800 <rdar://problem/85049490> 1825568 2 447592 youennf 2021-12-20 03:03:30 -0800 Created attachment 447592 Patch 1826049 3 447592 bfulgham 2021-12-21 10:43:58 -0800 Comment on attachment 447592 Patch r=me 1826253 4 ews-feeder 2021-12-22 02:14:21 -0800 Committed r287353 (245495@main): <https://commits.webkit.org/245495@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447592. 447592 2021-12-20 03:03:30 -0800 2021-12-22 02:14:23 -0800 Patch bug-234507-20211220120327.patch text/plain 13712 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MDY5CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYWQ3ZDk1ODdlOWE1MjMz YmFiMDNhZDlhMzJjOGRiNmFiYzJhNjRiOC4uOTIxYzBkMmM5Y2FmNmZiYTA1YzE0MTY5NjE5ZWU2 OTI4Mjg4MGQ0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIxLTEyLTIwICBZb3Vl bm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KKworICAgICAgICBVc2UgcmVxdWVzdGVyIHdo ZW4gY2FsbGluZyB1cGRhdGVSZXF1ZXN0QW5kQWRkRXh0cmFGaWVsZHMKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDUwNworICAgICAgICA8cmRhcjov L3Byb2JsZW0vODUwNDk0OTA+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgSW4gY2FzZSBvZiBuYXZpZ2F0aW9uIGxvYWRzLCB0aGUgcmVxdWVzdGVyIGlz IHRoZSBmZXRjaCByZXF1ZXN0IGNsaWVudC4KKyAgICAgICAgQXMgc3VjaCwgaXQgc2hvdWxkIGJl IHRoZSBvbmUgdXNlZCB0byBkZXRlcm1pbmUgd2hldGhlciB0aGUgcmVxdWVzdCBpcyBjcm9zcy1v cmlnaW4gaXMgbm90LgorICAgICAgICBQYXNzIHRoZSByZXF1ZXN0ZXIgdG8gdXBkYXRlUmVxdWVz dEFuZEFkZEV4dHJhRmllbGRzIHRvIGRvIHRoZSBjb3JyZWN0IGNvbXB1dGF0aW9uLgorICAgICAg ICBWYWxpZGF0ZSB0aGF0IHNvbWUgcmVxdWVzdCBmaWVsZHMgYXJlIG5vdyBjb3JyZWN0bHkgb2Jz ZXJ2ZWQgaW4gc2VydmljZSB3b3JrZXJzLgorCisgICAgICAgIFRlc3Q6IGh0dHAvd3B0L3NlcnZp Y2Utd29ya2Vycy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRlLmh0dHBzLmh0bWwKKworICAgICAgICAq IGxvYWRlci9GcmFtZUxvYWRlci5jcHA6CisgICAgICAgICogbG9hZGVyL0ZyYW1lTG9hZGVyLmg6 CisgICAgICAgICogdGVzdGluZy9TZXJ2aWNlV29ya2VySW50ZXJuYWxzLmNwcDoKKyAgICAgICAg KiB0ZXN0aW5nL1NlcnZpY2VXb3JrZXJJbnRlcm5hbHMuaDoKKyAgICAgICAgKiB0ZXN0aW5nL1Nl cnZpY2VXb3JrZXJJbnRlcm5hbHMuaWRsOgorCiAyMDIxLTEyLTE3ICBZb3Vlbm4gRmFibGV0ICA8 eW91ZW5uQGFwcGxlLmNvbT4KIAogICAgICAgICBVcGRhdGUgUlRDUnRwU2NyaXB0VHJhbnNmb3Jt ZXIga2V5IGZyYW1lIEFQSSBhY2NvcmRpbmcgbGF0ZXN0IHNwZWMgcHJvcG9zYWwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRnJhbWVMb2FkZXIuY3BwCmluZGV4IDZjNWVlM2E5YjMxYWU4Yjg0ZGI5MjBiNjZl YmYyMTRmMjZlYzlhZDYuLjNmZDUzNWE4ZDU5NmQ4YWJmNmYxOWU5ODY2OTQzYzA2ODU1MmE4ZjYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9GcmFtZUxvYWRlci5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmNwcApAQCAtMTM0Miw3ICsxMzQyLDcg QEAgdm9pZCBGcmFtZUxvYWRlcjo6bG9hZFVSTChGcmFtZUxvYWRSZXF1ZXN0JiYgZnJhbWVMb2Fk UmVxdWVzdCwgY29uc3QgU3RyaW5nJiByZWYKICAgICBpZiAoIXJlZmVycmVyLmlzRW1wdHkoKSkK ICAgICAgICAgcmVxdWVzdC5zZXRIVFRQUmVmZXJyZXIocmVmZXJyZXIpOwogCi0gICAgdXBkYXRl UmVxdWVzdEFuZEFkZEV4dHJhRmllbGRzKHJlcXVlc3QsIElzTWFpblJlc291cmNlOjpZZXMsIG5l d0xvYWRUeXBlKTsKKyAgICB1cGRhdGVSZXF1ZXN0QW5kQWRkRXh0cmFGaWVsZHMocmVxdWVzdCwg SXNNYWluUmVzb3VyY2U6OlllcywgbmV3TG9hZFR5cGUsIFNob3VsZFVwZGF0ZUFwcEluaXRpYXRl ZFZhbHVlOjpZZXMsIEZyYW1lTG9hZGVyOjpJc1NlcnZpY2VXb3JrZXJOYXZpZ2F0aW9uTG9hZDo6 Tm8sICZmcmFtZUxvYWRSZXF1ZXN0LnJlcXVlc3RlcigpKTsKIAogICAgIEFTU0VSVChuZXdMb2Fk VHlwZSAhPSBGcmFtZUxvYWRUeXBlOjpTYW1lKTsKIApAQCAtMjg5OSw3ICsyODk5LDcgQEAgUmVz b3VyY2VSZXF1ZXN0Q2FjaGVQb2xpY3kgRnJhbWVMb2FkZXI6OmRlZmF1bHRSZXF1ZXN0Q2FjaGlu Z1BvbGljeShjb25zdCBSZXNvdXIKICAgICByZXR1cm4gUmVzb3VyY2VSZXF1ZXN0Q2FjaGVQb2xp Y3k6OlVzZVByb3RvY29sQ2FjaGVQb2xpY3k7CiB9CiAKLXZvaWQgRnJhbWVMb2FkZXI6OnVwZGF0 ZVJlcXVlc3RBbmRBZGRFeHRyYUZpZWxkcyhSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3QsIElzTWFp blJlc291cmNlIG1haW5SZXNvdXJjZSwgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgU2hvdWxkVXBk YXRlQXBwSW5pdGlhdGVkVmFsdWUgc2hvdWxkVXBkYXRlLCBJc1NlcnZpY2VXb3JrZXJOYXZpZ2F0 aW9uTG9hZCBpc1NlcnZpY2VXb3JrZXJOYXZpZ2F0aW9uTG9hZCkKK3ZvaWQgRnJhbWVMb2FkZXI6 OnVwZGF0ZVJlcXVlc3RBbmRBZGRFeHRyYUZpZWxkcyhSZXNvdXJjZVJlcXVlc3QmIHJlcXVlc3Qs IElzTWFpblJlc291cmNlIG1haW5SZXNvdXJjZSwgRnJhbWVMb2FkVHlwZSBsb2FkVHlwZSwgU2hv dWxkVXBkYXRlQXBwSW5pdGlhdGVkVmFsdWUgc2hvdWxkVXBkYXRlLCBJc1NlcnZpY2VXb3JrZXJO YXZpZ2F0aW9uTG9hZCBpc1NlcnZpY2VXb3JrZXJOYXZpZ2F0aW9uTG9hZCwgRG9jdW1lbnQqIGlu aXRpYXRvcikKIHsKICAgICBBU1NFUlQoaXNTZXJ2aWNlV29ya2VyTmF2aWdhdGlvbkxvYWQgPT0g SXNTZXJ2aWNlV29ya2VyTmF2aWdhdGlvbkxvYWQ6Ok5vIHx8IG1haW5SZXNvdXJjZSAhPSBJc01h aW5SZXNvdXJjZTo6WWVzKTsKIApAQCAtMjkxOSwxNCArMjkxOSwxNiBAQCB2b2lkIEZyYW1lTG9h ZGVyOjp1cGRhdGVSZXF1ZXN0QW5kQWRkRXh0cmFGaWVsZHMoUmVzb3VyY2VSZXF1ZXN0JiByZXF1 ZXN0LCBJc01haQogICAgIH0KIAogICAgIGlmIChyZXF1ZXN0LmlzU2FtZVNpdGVVbnNwZWNpZmll ZCgpKSB7Ci0gICAgICAgIGF1dG8qIGluaXRpYXRvciA9IG1fZnJhbWUuZG9jdW1lbnQoKTsKLSAg ICAgICAgaWYgKGlzTWFpblJlc291cmNlKSB7Ci0gICAgICAgICAgICBhdXRvKiBvd25lckZyYW1l ID0gbV9mcmFtZS50cmVlKCkucGFyZW50KCk7Ci0gICAgICAgICAgICBpZiAoIW93bmVyRnJhbWUg JiYgbV9zdGF0ZU1hY2hpbmUuaXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKLSAg ICAgICAgICAgICAgICBvd25lckZyYW1lID0gbV9vcGVuZXIuZ2V0KCk7Ci0gICAgICAgICAgICBp ZiAob3duZXJGcmFtZSkKLSAgICAgICAgICAgICAgICBpbml0aWF0b3IgPSBvd25lckZyYW1lLT5k b2N1bWVudCgpOwotICAgICAgICAgICAgQVNTRVJUKG93bmVyRnJhbWUgfHwgbV9mcmFtZS5pc01h aW5GcmFtZSgpKTsKKyAgICAgICAgaWYgKCFpbml0aWF0b3IpIHsKKyAgICAgICAgICAgIGluaXRp YXRvciA9IG1fZnJhbWUuZG9jdW1lbnQoKTsKKyAgICAgICAgICAgIGlmIChpc01haW5SZXNvdXJj ZSkgeworICAgICAgICAgICAgICAgIGF1dG8qIG93bmVyRnJhbWUgPSBtX2ZyYW1lLnRyZWUoKS5w YXJlbnQoKTsKKyAgICAgICAgICAgICAgICBpZiAoIW93bmVyRnJhbWUgJiYgbV9zdGF0ZU1hY2hp bmUuaXNEaXNwbGF5aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQoKSkKKyAgICAgICAgICAgICAgICAg ICAgb3duZXJGcmFtZSA9IG1fb3BlbmVyLmdldCgpOworICAgICAgICAgICAgICAgIGlmIChvd25l ckZyYW1lKQorICAgICAgICAgICAgICAgICAgICBpbml0aWF0b3IgPSBvd25lckZyYW1lLT5kb2N1 bWVudCgpOworICAgICAgICAgICAgICAgIEFTU0VSVChvd25lckZyYW1lIHx8IG1fZnJhbWUuaXNN YWluRnJhbWUoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAgYWRkU2FtZVNp dGVJbmZvVG9SZXF1ZXN0SWZOZWVkZWQocmVxdWVzdCwgaW5pdGlhdG9yKTsKICAgICB9CkBAIC0z MDYzLDcgKzMwNjUsNyBAQCB2b2lkIEZyYW1lTG9hZGVyOjpsb2FkUG9zdFJlcXVlc3QoRnJhbWVM b2FkUmVxdWVzdCYmIHJlcXVlc3QsIGNvbnN0IFN0cmluZyYgcmVmZQogICAgIHdvcmtpbmdSZXNv dXJjZVJlcXVlc3Quc2V0SFRUUE1ldGhvZCgiUE9TVCIpOwogICAgIHdvcmtpbmdSZXNvdXJjZVJl cXVlc3Quc2V0SFRUUEJvZHkoaW5SZXF1ZXN0Lmh0dHBCb2R5KCkpOwogICAgIHdvcmtpbmdSZXNv dXJjZVJlcXVlc3Quc2V0SFRUUENvbnRlbnRUeXBlKGNvbnRlbnRUeXBlKTsKLSAgICB1cGRhdGVS ZXF1ZXN0QW5kQWRkRXh0cmFGaWVsZHMod29ya2luZ1Jlc291cmNlUmVxdWVzdCwgSXNNYWluUmVz b3VyY2U6OlllcywgbG9hZFR5cGUpOworICAgIHVwZGF0ZVJlcXVlc3RBbmRBZGRFeHRyYUZpZWxk cyh3b3JraW5nUmVzb3VyY2VSZXF1ZXN0LCBJc01haW5SZXNvdXJjZTo6WWVzLCBsb2FkVHlwZSwg U2hvdWxkVXBkYXRlQXBwSW5pdGlhdGVkVmFsdWU6OlllcywgRnJhbWVMb2FkZXI6OklzU2Vydmlj ZVdvcmtlck5hdmlnYXRpb25Mb2FkOjpObywgJnJlcXVlc3QucmVxdWVzdGVyKCkpOwogCiAgICAg aWYgKERvY3VtZW50KiBkb2N1bWVudCA9IG1fZnJhbWUuZG9jdW1lbnQoKSkKICAgICAgICAgZG9j dW1lbnQtPmNvbnRlbnRTZWN1cml0eVBvbGljeSgpLT51cGdyYWRlSW5zZWN1cmVSZXF1ZXN0SWZO ZWVkZWQod29ya2luZ1Jlc291cmNlUmVxdWVzdCwgQ29udGVudFNlY3VyaXR5UG9saWN5OjpJbnNl Y3VyZVJlcXVlc3RUeXBlOjpMb2FkKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRl ci9GcmFtZUxvYWRlci5oIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9hZGVyLmgKaW5k ZXggNzVhZTI4NGMyYzM0ZmRkODllODU2NGRhNDM5ZGE3NzI1YWZiYzhlNi4uODZmYjE3NTQ3Y2Fi ZDRkYjc2OTIwNTQzNzQzMjI0NzQ0NWJiYjZlZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv bG9hZGVyL0ZyYW1lTG9hZGVyLmgKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0ZyYW1lTG9h ZGVyLmgKQEAgLTMxOSw3ICszMTksNyBAQCBwdWJsaWM6CiAKICAgICBlbnVtIGNsYXNzIElzU2Vy dmljZVdvcmtlck5hdmlnYXRpb25Mb2FkIDogYm9vbCB7IE5vLCBZZXMgfTsKICAgICAvLyBGb3Ig c3VicmVzb3VyY2UgcmVxdWVzdHMgdGhlIEZyYW1lTG9hZFR5cGUgcGFyYW1ldGVyIGhhcyBubyBl ZmZlY3QgYW5kIGNhbiBiZSBza2lwcGVkLgotICAgIHZvaWQgdXBkYXRlUmVxdWVzdEFuZEFkZEV4 dHJhRmllbGRzKFJlc291cmNlUmVxdWVzdCYsIElzTWFpblJlc291cmNlLCBGcmFtZUxvYWRUeXBl ID0gRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQsIFNob3VsZFVwZGF0ZUFwcEluaXRpYXRlZFZhbHVl ID0gU2hvdWxkVXBkYXRlQXBwSW5pdGlhdGVkVmFsdWU6OlllcywgSXNTZXJ2aWNlV29ya2VyTmF2 aWdhdGlvbkxvYWQgPSBJc1NlcnZpY2VXb3JrZXJOYXZpZ2F0aW9uTG9hZDo6Tm8pOworICAgIHZv aWQgdXBkYXRlUmVxdWVzdEFuZEFkZEV4dHJhRmllbGRzKFJlc291cmNlUmVxdWVzdCYsIElzTWFp blJlc291cmNlLCBGcmFtZUxvYWRUeXBlID0gRnJhbWVMb2FkVHlwZTo6U3RhbmRhcmQsIFNob3Vs ZFVwZGF0ZUFwcEluaXRpYXRlZFZhbHVlID0gU2hvdWxkVXBkYXRlQXBwSW5pdGlhdGVkVmFsdWU6 OlllcywgSXNTZXJ2aWNlV29ya2VyTmF2aWdhdGlvbkxvYWQgPSBJc1NlcnZpY2VXb3JrZXJOYXZp Z2F0aW9uTG9hZDo6Tm8sIERvY3VtZW50KiA9IG51bGxwdHIpOwogCiAgICAgdm9pZCBzY2hlZHVs ZVJlZnJlc2hJZk5lZWRlZChEb2N1bWVudCYsIGNvbnN0IFN0cmluZyYgY29udGVudCwgSXNNZXRh UmVmcmVzaCk7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvU2VydmljZVdv cmtlckludGVybmFscy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL1NlcnZpY2VXb3JrZXJJ bnRlcm5hbHMuY3BwCmluZGV4IDYyNTI4ZGEyMDZmYTNiZTM2MjgwN2U0NWVlZDBmODVjZGRmNTg0 ZTAuLjljNDhiNjk4MGJjNTBmODAwYzE0ODljZTQxNGRlNjBkNmI3YTRmODggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvU2VydmljZVdvcmtlckludGVybmFscy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvdGVzdGluZy9TZXJ2aWNlV29ya2VySW50ZXJuYWxzLmNwcApAQCAtMTg4 LDYgKzE4OCwxMSBAQCBSZWZQdHI8UHVzaFN1YnNjcmlwdGlvbj4gU2VydmljZVdvcmtlckludGVy bmFsczo6Y3JlYXRlUHVzaFN1YnNjcmlwdGlvbihjb25zdCBTdAogICAgIHJldHVybiBQdXNoU3Vi c2NyaXB0aW9uOjpjcmVhdGUoUHVzaFN1YnNjcmlwdGlvbkRhdGEgeyBXVEZNb3ZlKG15RW5kcG9p bnQpLCBleHBpcmF0aW9uVGltZSwgV1RGTW92ZShteVNlcnZlclZBUElEUHVibGljS2V5KSwgV1RG TW92ZShteUNsaWVudEVDREhQdWJsaWNLZXkpLCBXVEZNb3ZlKG15QXV0aCkgfSk7CiB9CiAKK2Jv b2wgU2VydmljZVdvcmtlckludGVybmFsczo6ZmV0Y2hFdmVudElzU2FtZVNpdGUoRmV0Y2hFdmVu dCYgZXZlbnQpCit7CisgICAgcmV0dXJuIGV2ZW50LnJlcXVlc3QoKS5pbnRlcm5hbFJlcXVlc3Qo KS5pc1NhbWVTaXRlKCk7Cit9CisKIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKIAogI2VuZGlmCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL1NlcnZpY2VXb3JrZXJJbnRlcm5hbHMu aCBiL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvU2VydmljZVdvcmtlckludGVybmFscy5oCmluZGV4 IGEwYWUzYzQwY2M0ZGFmMjc3NTVjMTQ2Y2QxYTVlOWE2MDZmMDBjOTcuLmJhNjcyZDUyZmIxNWFj NzJlMTA2OGQ3ZDcyNWY0NTEzZjdkMDc4OTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Rl c3RpbmcvU2VydmljZVdvcmtlckludGVybmFscy5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3Rlc3Rp bmcvU2VydmljZVdvcmtlckludGVybmFscy5oCkBAIC02OSw2ICs2OSw4IEBAIHB1YmxpYzoKICAg ICAKICAgICBSZWZQdHI8UHVzaFN1YnNjcmlwdGlvbj4gY3JlYXRlUHVzaFN1YnNjcmlwdGlvbihj b25zdCBTdHJpbmcmIGVuZHBvaW50LCBzdGQ6Om9wdGlvbmFsPEVwb2NoVGltZVN0YW1wPiBleHBp cmF0aW9uVGltZSwgY29uc3QgQXJyYXlCdWZmZXImIHNlcnZlclZBUElEUHVibGljS2V5LCBjb25z dCBBcnJheUJ1ZmZlciYgY2xpZW50RUNESFB1YmxpY0tleSwgY29uc3QgQXJyYXlCdWZmZXImIGF1 dGgpOwogCisgICAgYm9vbCBmZXRjaEV2ZW50SXNTYW1lU2l0ZShGZXRjaEV2ZW50Jik7CisKIHBy aXZhdGU6CiAgICAgZXhwbGljaXQgU2VydmljZVdvcmtlckludGVybmFscyhTZXJ2aWNlV29ya2Vy SWRlbnRpZmllcik7CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvU2Vydmlj ZVdvcmtlckludGVybmFscy5pZGwgYi9Tb3VyY2UvV2ViQ29yZS90ZXN0aW5nL1NlcnZpY2VXb3Jr ZXJJbnRlcm5hbHMuaWRsCmluZGV4IGVhYmM2NTM0ZDc1OTBjNjBiOGFkNWFmZGRiZDlhODQ3MzMy M2U5ZmMuLjU4ZmVkYzEwZGVhYTlkZGM4MjI5OWZkOGM1ZDFlNTQ2ODc4NTA1MWYgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3Rlc3RpbmcvU2VydmljZVdvcmtlckludGVybmFscy5pZGwKKysr IGIvU291cmNlL1dlYkNvcmUvdGVzdGluZy9TZXJ2aWNlV29ya2VySW50ZXJuYWxzLmlkbApAQCAt NDksNCArNDksNiBAQAogICAgIFByb21pc2U8Ym9vbGVhbj4gbGFzdE5hdmlnYXRpb25XYXNBcHBJ bml0aWF0ZWQoKTsKICAgICAKICAgICBQdXNoU3Vic2NyaXB0aW9uIGNyZWF0ZVB1c2hTdWJzY3Jp cHRpb24oVVNWU3RyaW5nIGVuZHBvaW50LCBFcG9jaFRpbWVTdGFtcD8gZXhwaXJhdGlvblRpbWUs IEFycmF5QnVmZmVyIHNlcnZlclZBUElEUHVibGljS2V5LCBBcnJheUJ1ZmZlciBjbGllbnRFQ0RI UHVibGljS2V5LCBBcnJheUJ1ZmZlciBhdXRoKTsKKworICAgIGJvb2xlYW4gZmV0Y2hFdmVudElz U2FtZVNpdGUoRmV0Y2hFdmVudCBldmVudCk7CiB9OwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv Q2hhbmdlTG9nIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCmluZGV4IGEzYTg2M2UwMTAwNzE5MjMy OTRkN2UwNmM4MDVlYzU1MDY1NjZkZGUuLjVlZGJiMjIxM2I2NDgzYWE0ZGNjY2Y2YmZmZDExZjM3 ZmM0N2MxMjIgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRU ZXN0cy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAyMS0xMi0yMCAgWW91ZW5uIEZhYmxl dCAgPHlvdWVubkBhcHBsZS5jb20+CisKKyAgICAgICAgVXNlIHJlcXVlc3RlciB3aGVuIGNhbGxp bmcgdXBkYXRlUmVxdWVzdEFuZEFkZEV4dHJhRmllbGRzCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzQ1MDcKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVt Lzg1MDQ5NDkwPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogaHR0cC93cHQvc2VydmljZS13b3JrZXJzL25hdmlnYXRpb24taWZyYW1lLXNpdGUtd29y a2VyLmpzOiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvbmF2aWdh dGlvbi1pZnJhbWUtc2l0ZS5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0 dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRlLmh0dHBzLmh0bWw6 IEFkZGVkLgorICAgICAgICAqIGh0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9yZXNvdXJjZXMvbmF2 aWdhdGlvbi1pZnJhbWUtc2l0ZS1mcmFtZS5odG1sOiBBZGRlZC4KKwogMjAyMS0xMi0xNyAgWW91 ZW5uIEZhYmxldCAgPHlvdWVubkBhcHBsZS5jb20+CiAKICAgICAgICAgVXBkYXRlIFJUQ1J0cFNj cmlwdFRyYW5zZm9ybWVyIGtleSBmcmFtZSBBUEkgYWNjb3JkaW5nIGxhdGVzdCBzcGVjIHByb3Bv c2FsCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvbmF2 aWdhdGlvbi1pZnJhbWUtc2l0ZS13b3JrZXIuanMgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9zZXJ2 aWNlLXdvcmtlcnMvbmF2aWdhdGlvbi1pZnJhbWUtc2l0ZS13b3JrZXIuanMKbmV3IGZpbGUgbW9k ZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4u MTlmMDVhYjMzOTE3NWY3ZDFiNDQ5ZjAyYzI3Y2JmNWIwNDhkN2VkNgotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9uYXZpZ2F0aW9uLWlmcmFt ZS1zaXRlLXdvcmtlci5qcwpAQCAtMCwwICsxLDExIEBACithZGRFdmVudExpc3RlbmVyKCJtZXNz YWdlIiwgKGUpID0+IHsKKyAgICBzZWxmLnBvcnQgPSBlLmRhdGEucG9ydDsKK30pOworCithZGRF dmVudExpc3RlbmVyKCJmZXRjaCIsIChlKSA9PiB7CisgICAgaWYgKHNlbGYuaW50ZXJuYWxzKSB7 CisgICAgICAgIHNlbGYucG9ydC5wb3N0TWVzc2FnZShzZWxmLmludGVybmFscy5mZXRjaEV2ZW50 SXNTYW1lU2l0ZShlKSA/ICJGQUlMIiA6ICJQQVNTIik7CisgICAgICAgIHJldHVybjsKKyAgICB9 CisgICAgc2VsZi5wb3J0LnBvc3RNZXNzYWdlKCJQQVNTIik7Cit9KTsKZGlmZiAtLWdpdCBhL0xh eW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRl Lmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vy cy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRlLmh0dHBzLWV4cGVjdGVkLnR4dApuZXcgZmlsZSBtb2Rl IDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4z NDJiYTMzMmZlNjM0YjFjNTYwMGExNDBhZWZhZDcxNTVkYzcxMTA0Ci0tLSAvZGV2L251bGwKKysr IGIvTGF5b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13b3JrZXJzL25hdmlnYXRpb24taWZyYW1l LXNpdGUuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorCitQQVNTIFNldHVwIHdv cmtlcgorUEFTUyBWYWxpZGF0ZSB3b3JrZXIgZ2V0cyByaWdodCByZXF1ZXN0IGFmdGVyIG5hdmln YXRpb24KK1BBU1MgVmFsaWRhdGUgd29ya2VyIGdldHMgcmlnaHQgcmVxdWVzdCBhZnRlciBwb3N0 IG5hdmlnYXRpb24KKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0cC93cHQvc2VydmljZS13 b3JrZXJzL25hdmlnYXRpb24taWZyYW1lLXNpdGUuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRlLmh0dHBzLmh0bWwK bmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMC4uMDZjYTY0MjAwYzkwNTQ5M2M0NGQyYjkwZTJkMjQ2YjA5NmQ4YTM2MQotLS0g L2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvd3B0L3NlcnZpY2Utd29ya2Vycy9uYXZp Z2F0aW9uLWlmcmFtZS1zaXRlLmh0dHBzLmh0bWwKQEAgLTAsMCArMSw2OCBAQAorPGh0bWw+Cis8 aGVhZD4KKzx0aXRsZT5TZXJ2aWNlIFdvcmtlciBGZXRjaCBFdmVudDwvdGl0bGU+Cis8c2NyaXB0 IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0i L3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9k eT4KKzxzY3JpcHQ+Cit2YXIgc2NvcGUgPSAicmVzb3VyY2VzLyI7Cit2YXIgcmVnaXN0cmF0aW9u OworY29uc3QgY2hhbm5lbCA9IG5ldyBNZXNzYWdlQ2hhbm5lbDsKKworZnVuY3Rpb24gd2l0aEZy YW1lKHVybCkKK3sKKyAgICByZXR1cm4gbmV3IFByb21pc2UoKHJlc29sdmUpID0+IHsKKyAgICAg ICAgbGV0IGZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgnaWZyYW1lJyk7CisgICAgICAg IGZyYW1lLnNyYyA9IHVybDsKKyAgICAgICAgZnJhbWUub25sb2FkID0gZnVuY3Rpb24oKSB7IHJl c29sdmUoZnJhbWUpOyB9OworICAgICAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGZyYW1l KTsKKyAgICB9KTsKK30KKworYXN5bmMgZnVuY3Rpb24gcmVnaXN0ZXJTZXJ2aWNlV29ya2VyKHNj b3BlKQoreworICAgIHZhciByZWdpc3RyYXRpb24gPSBhd2FpdCBuYXZpZ2F0b3Iuc2VydmljZVdv cmtlci5yZWdpc3RlcigibmF2aWdhdGlvbi1pZnJhbWUtc2l0ZS13b3JrZXIuanMiLCB7IHNjb3Bl IDogc2NvcGUgfSk7CisgICAgdmFyIGFjdGl2ZVdvcmtlciA9IHJlZ2lzdHJhdGlvbi5hY3RpdmU7 CisgICAgaWYgKGFjdGl2ZVdvcmtlcikgeworICAgICAgICBhY3RpdmVXb3JrZXIucG9zdE1lc3Nh Z2UoeyBwb3J0OiBjaGFubmVsLnBvcnQxIH0sIFtjaGFubmVsLnBvcnQxXSk7CisgICAgICAgIHJl dHVybjsKKyAgICB9CisgICAgYWN0aXZlV29ya2VyID0gcmVnaXN0cmF0aW9uLmluc3RhbGxpbmc7 CisgICAgYWN0aXZlV29ya2VyLnBvc3RNZXNzYWdlKHsgcG9ydDogY2hhbm5lbC5wb3J0MSB9LCBb Y2hhbm5lbC5wb3J0MV0pOworICAgIHJldHVybiBuZXcgUHJvbWlzZShyZXNvbHZlID0+IHsKKyAg ICAgICAgYWN0aXZlV29ya2VyLmFkZEV2ZW50TGlzdGVuZXIoJ3N0YXRlY2hhbmdlJywgKCkgPT4g eworICAgICAgICAgICAgaWYgKGFjdGl2ZVdvcmtlci5zdGF0ZSA9PT0gImFjdGl2YXRlZCIpCisg ICAgICAgICAgICAgICAgcmVzb2x2ZShyZWdpc3RyYXRpb24pOworICAgICAgICB9KTsKKyAgICB9 KTsKK30KKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgcmVnaXN0cmF0aW9u ID0gYXdhaXQgcmVnaXN0ZXJTZXJ2aWNlV29ya2VyKHNjb3BlKTsKK30sICJTZXR1cCB3b3JrZXIi KTsKKworcHJvbWlzZV90ZXN0KGFzeW5jICh0ZXN0KSA9PiB7CisgICAgY29uc3QgcmVzdWx0UHJv bWlzZSA9IG5ldyBQcm9taXNlKHJlc29sdmUgPT4gY2hhbm5lbC5wb3J0Mi5vbm1lc3NhZ2UgPSAo ZXZlbnQpID0+IHJlc29sdmUoZXZlbnQuZGF0YSkpOworCisgICAgLy8gQ3Jvc3Mtb3JpZ2luIGlm cmFtZSB0aGF0IHdpbGwgcmVkaXJlY3QgdG8gaWZyYW1lIHRoYXQgd2lsbCBiZSBjb250cm9sbGVk IGJ5IHJlZ2lzdGVyZWQgc2VydmljZSB3b3JrZXIuCisgICAgY29uc3QgZnJhbWVQcm9taXNlID0g d2l0aEZyYW1lKCJodHRwczovLzEyNy4wLjAuMTo5NDQzL1dlYktpdC9zZXJ2aWNlLXdvcmtlcnMv cmVzb3VyY2VzL25hdmlnYXRpb24taWZyYW1lLXNpdGUtZnJhbWUuaHRtbCIpOworCisgICAgYXNz ZXJ0X2VxdWFscyhhd2FpdCByZXN1bHRQcm9taXNlLCAiUEFTUyIpOworICAgIGNvbnN0IGZyYW1l ID0gYXdhaXQgZnJhbWVQcm9taXNlOworICAgIGZyYW1lLnJlbW92ZSgpOworfSwgIlZhbGlkYXRl IHdvcmtlciBnZXRzIHJpZ2h0IHJlcXVlc3QgYWZ0ZXIgbmF2aWdhdGlvbiIpOworCitwcm9taXNl X3Rlc3QoYXN5bmMgKHRlc3QpID0+IHsKKyAgICBjb25zdCByZXN1bHRQcm9taXNlID0gbmV3IFBy b21pc2UocmVzb2x2ZSA9PiBjaGFubmVsLnBvcnQyLm9ubWVzc2FnZSA9IChldmVudCkgPT4gcmVz b2x2ZShldmVudC5kYXRhKSk7CisKKyAgICAvLyBDcm9zcy1vcmlnaW4gaWZyYW1lIHRoYXQgd2ls bCByZWRpcmVjdCB0byBpZnJhbWUgdGhhdCB3aWxsIGJlIGNvbnRyb2xsZWQgYnkgcmVnaXN0ZXJl ZCBzZXJ2aWNlIHdvcmtlciB0aHJvdWdoIFBPU1QuCisgICAgY29uc3QgZnJhbWVQcm9taXNlID0g d2l0aEZyYW1lKCJodHRwczovLzEyNy4wLjAuMTo5NDQzL1dlYktpdC9zZXJ2aWNlLXdvcmtlcnMv cmVzb3VyY2VzL25hdmlnYXRpb24taWZyYW1lLXNpdGUtZnJhbWUuaHRtbD9wb3N0Iik7CisKKyAg ICBhc3NlcnRfZXF1YWxzKGF3YWl0IHJlc3VsdFByb21pc2UsICJQQVNTIik7CisgICAgY29uc3Qg ZnJhbWUgPSBhd2FpdCBmcmFtZVByb21pc2U7CisgICAgZnJhbWUucmVtb3ZlKCk7Cit9LCAiVmFs aWRhdGUgd29ya2VyIGdldHMgcmlnaHQgcmVxdWVzdCBhZnRlciBwb3N0IG5hdmlnYXRpb24iKTsK Kzwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaHR0 cC93cHQvc2VydmljZS13b3JrZXJzL3Jlc291cmNlcy9uYXZpZ2F0aW9uLWlmcmFtZS1zaXRlLWZy YW1lLmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3dwdC9zZXJ2aWNlLXdvcmtlcnMvcmVzb3VyY2Vz L25hdmlnYXRpb24taWZyYW1lLXNpdGUtZnJhbWUuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NApp bmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5hZmQ3YTM0NzA1 MDUyMGJlMzg5NTZjMjM1NWUxNDUwNGE5ZGZjY2MxCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0 VGVzdHMvaHR0cC93cHQvc2VydmljZS13b3JrZXJzL3Jlc291cmNlcy9uYXZpZ2F0aW9uLWlmcmFt ZS1zaXRlLWZyYW1lLmh0bWwKQEAgLTAsMCArMSwxMyBAQAorPGZvcm0gbWV0aG9kPSJwb3N0IiBp ZD0ibXlGb3JtIiBhY3Rpb249Imh0dHBzOi8vbG9jYWxob3N0Ojk0NDMvV2ViS2l0L3NlcnZpY2Ut d29ya2Vycy9yZXNvdXJjZXMvIj4KKzxzY3JpcHQ+CitmdW5jdGlvbiBkb1Rlc3QoKQoreworICAg IGlmICh3aW5kb3cubG9jYXRpb24uc2VhcmNoICE9PSAiP3Bvc3QiKSB7CisgICAgICAgIHdpbmRv dy5sb2NhdGlvbiA9ICJodHRwczovL2xvY2FsaG9zdDo5NDQzL1dlYktpdC9zZXJ2aWNlLXdvcmtl cnMvcmVzb3VyY2VzLyI7CisgICAgICAgIHJldHVybjsKKyAgICB9CisgICAgbXlGb3JtLnN1Ym1p dCgpOworfQorCitkb1Rlc3QoKTsKKzwvc2NyaXB0Pgo=