238800 2022-04-05 05:41:36 -0700 In case of COOP-based process swap, we need to make sure the document gets controlled by its matching service worker registration 2022-05-26 14:59:30 -0700 1 1 1 Unclassified WebKit Service Workers WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 238738 1 youennf youennf bfulgham cdumez ggaren webkit-bug-importer oldest_to_newest 1858352 0 youennf 2022-04-05 05:41:36 -0700 In case of COOP-based process swap, we need to make sure the document gets controlled by its matching service worker registration 1858353 1 webkit-bug-importer 2022-04-05 05:41:56 -0700 <rdar://problem/91288849> 1858395 2 456705 youennf 2022-04-05 09:06:25 -0700 Created attachment 456705 Patch 1858816 3 456705 cdumez 2022-04-06 07:19:40 -0700 Comment on attachment 456705 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=456705&action=review r=me > Source/WebKit/NetworkProcess/NetworkLoadParameters.h:47 > + mutable WebPageProxyIdentifier webPageProxyID; These mutable seem a little odd. Maybe we should imply not mark the NetworkResourceLoader data member as const? 1858830 4 youennf 2022-04-06 08:09:48 -0700 (In reply to Chris Dumez from comment #3) > Comment on attachment 456705 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=456705&action=review > > r=me > > > Source/WebKit/NetworkProcess/NetworkLoadParameters.h:47 > > + mutable WebPageProxyIdentifier webPageProxyID; > > These mutable seem a little odd. Maybe we should imply not mark the > NetworkResourceLoader data member as const? There used to be no mutable, I guess we should remove them, and const_cast m_parameters when needed instead. Or make the member no longer const. 1858832 5 youennf 2022-04-06 08:11:02 -0700 > There used to be no mutable, I guess we should remove them, and const_cast > m_parameters when needed instead. Or make the member no longer const. I'll look into cleaning all these mutables in a follow-up. 1858834 6 cdumez 2022-04-06 08:13:42 -0700 (In reply to youenn fablet from comment #4) > (In reply to Chris Dumez from comment #3) > > Comment on attachment 456705 [details] > > Patch > > > > View in context: > > https://bugs.webkit.org/attachment.cgi?id=456705&action=review > > > > r=me > > > > > Source/WebKit/NetworkProcess/NetworkLoadParameters.h:47 > > > + mutable WebPageProxyIdentifier webPageProxyID; > > > > These mutable seem a little odd. Maybe we should imply not mark the > > NetworkResourceLoader data member as const? > > There used to be no mutable, I guess we should remove them, and const_cast > m_parameters when needed instead. Or make the member no longer const. Right, I think keeping the m_parameters const at this point no longer makes sense since we're updating its data member. Mutable has some use cases (e.g. lazy init) but IMO this isn't a good use case for it. 1858835 7 ews-feeder 2022-04-06 08:21:59 -0700 Committed r292468 (249319@main): <https://commits.webkit.org/249319@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 456705. 1872154 8 bfulgham 2022-05-26 14:59:30 -0700 This fix shipped with Safari 15.5 (all platforms). 456705 2022-04-05 09:06:25 -0700 2022-04-06 08:22:00 -0700 Patch bug-238800-20220405180623.patch text/plain 13071 youennf U3VidmVyc2lvbiBSZXZpc2lvbjogMjkyMjc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU3ODczYjZjZjk4MzUyZTBm NzY4ZDFhYmU0N2QwNjZmYjVkY2JjMDYuLjdlZDgwYTc0ZmU0OWEzMTM1NmI2MmRhNmQzNmYzZjYx Yjk5NjAxMzAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjMgQEAKKzIwMjItMDQtMDUgIFlvdWVubiBG YWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgorCisgICAgICAgIEluIGNhc2Ugb2YgQ09PUC1iYXNl ZCBwcm9jZXNzIHN3YXAsIHdlIG5lZWQgdG8gbWFrZSBzdXJlIHRoZSBkb2N1bWVudCBnZXRzIGNv bnRyb2xsZWQgYnkgaXRzIG1hdGNoaW5nIHNlcnZpY2Ugd29ya2VyIHJlZ2lzdHJhdGlvbgorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjM4ODAwCisgICAg ICAgIDxyZGFyOi8vcHJvYmxlbS85MTI4ODg0OT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBNYWtlIHN1cmUgaW4gY2FzZSBsb2FkZXIgaXMgdHJhbnNm ZXJyZWQgdG8gY2FsbCBjb250cm9sQ2xpZW50IGluIHRoZSBuZXcgV2ViUHJvY2Vzcy4KKyAgICAg ICAgVG8gZG8gc28sIHdlIGFsc28gdXBkYXRlIHBhZ2UgYW5kIGZyYW1lIElEcy4KKyAgICAgICAg Q292ZXJlZCBieSBBUEkgdGVzdC4KKworICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrTG9hZFBhcmFtZXRlcnMuaDoKKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkUGFyYW1ldGVycy5oOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL05ldHdvcmtS ZXNvdXJjZUxvYWRlci5jcHA6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmg6CisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJT V1NlcnZlckNvbm5lY3Rpb24uY3BwOgorICAgICAgICAqIE5ldHdvcmtQcm9jZXNzL1NlcnZpY2VX b3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmg6CisKIDIwMjItMDQtMDUgIFlvdWVubiBGYWJs ZXQgIDx5b3Vlbm5AYXBwbGUuY29tPgogCiAgICAgICAgIEltcGxlbWVudCBTZXJ2aWNlV29ya2Vy V2luZG93Q2xpZW50Lm5hdmlnYXRlCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzLmNwcCBiL1NvdXJjZS9XZWJLaXQv TmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCmluZGV4IGU0 ZWEwM2MxMWI2YmIzZmZlM2Y4MGQyZjNiNzhmYjlhMzk4YzU2YTAuLjYxYTYwOWI2ZjkzOTRkNTNm NjEwYzdlOTY3M2FkYTNmMWU1ZGEwZGUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29y a1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCisrKyBiL1NvdXJjZS9X ZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCkBA IC01ODksNyArNTg5LDcgQEAgdm9pZCBOZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6c2No ZWR1bGVSZXNvdXJjZUxvYWQoTmV0d29ya1Jlc291cmNlTG9hZFBhcmEKICAgICAgICAgICAgIGlm IChhdXRvIGV4aXN0aW5nTG9hZGVyID0gc2Vzc2lvbi0+dGFrZUxvYWRlckF3YWl0aW5nV2ViUHJv Y2Vzc1RyYW5zZmVyKCpleGlzdGluZ0xvYWRlclRvUmVzdW1lKSkgewogICAgICAgICAgICAgICAg IENPTk5FQ1RJT05fUkVMRUFTRV9MT0coTG9hZGluZywgInNjaGVkdWxlUmVzb3VyY2VMb2FkOiBS ZXN1bWluZyBleGlzdGluZyBOZXR3b3JrUmVzb3VyY2VMb2FkZXIiKTsKICAgICAgICAgICAgICAg ICBtX25ldHdvcmtSZXNvdXJjZUxvYWRlcnMuYWRkKGlkZW50aWZpZXIsICpleGlzdGluZ0xvYWRl cik7Ci0gICAgICAgICAgICAgICAgZXhpc3RpbmdMb2FkZXItPnRyYW5zZmVyVG9OZXdXZWJQcm9j ZXNzKCp0aGlzLCBpZGVudGlmaWVyKTsKKyAgICAgICAgICAgICAgICBleGlzdGluZ0xvYWRlci0+ dHJhbnNmZXJUb05ld1dlYlByb2Nlc3MoKnRoaXMsIGxvYWRQYXJhbWV0ZXJzKTsKICAgICAgICAg ICAgICAgICByZXR1cm47CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICBDT05ORUNUSU9OX1JF TEVBU0VfTE9HX0VSUk9SKExvYWRpbmcsICJzY2hlZHVsZVJlc291cmNlTG9hZDogQ291bGQgbm90 IGZpbmQgZXhpc3RpbmcgTmV0d29ya1Jlc291cmNlTG9hZGVyIHRvIHJlc3VtZSwgd2lsbCBkbyBh IGZyZXNoIGxvYWQiKTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv TmV0d29ya0xvYWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtMb2FkUGFyYW1ldGVycy5oCmluZGV4IDE4Yjk1YTM3YzI4Mjg2ZGI1MzgwMGYxZjBiNmUz NTEwZWE2NDAxYjQuLjQ3MjdhMmJkY2ZmNDRlMjIxNDgyNTlmM2RkMWZhNWFjY2QwM2IwZDMgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0xvYWRQYXJhbWV0 ZXJzLmgKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrTG9hZFBhcmFt ZXRlcnMuaApAQCAtNDQsOSArNDQsOSBAQCBlbnVtIGNsYXNzIFByZWNvbm5lY3RPbmx5IDogYm9v bCB7IE5vLCBZZXMgfTsKIAogY2xhc3MgTmV0d29ya0xvYWRQYXJhbWV0ZXJzIHsKIHB1YmxpYzoK LSAgICBXZWJQYWdlUHJveHlJZGVudGlmaWVyIHdlYlBhZ2VQcm94eUlEOwotICAgIFdlYkNvcmU6 OlBhZ2VJZGVudGlmaWVyIHdlYlBhZ2VJRDsKLSAgICBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIg d2ViRnJhbWVJRDsKKyAgICBtdXRhYmxlIFdlYlBhZ2VQcm94eUlkZW50aWZpZXIgd2ViUGFnZVBy b3h5SUQ7CisgICAgbXV0YWJsZSBXZWJDb3JlOjpQYWdlSWRlbnRpZmllciB3ZWJQYWdlSUQ7Cisg ICAgbXV0YWJsZSBXZWJDb3JlOjpGcmFtZUlkZW50aWZpZXIgd2ViRnJhbWVJRDsKICAgICBSZWZQ dHI8V2ViQ29yZTo6U2VjdXJpdHlPcmlnaW4+IHRvcE9yaWdpbjsKICAgICBSZWZQdHI8V2ViQ29y ZTo6U2VjdXJpdHlPcmlnaW4+IHNvdXJjZU9yaWdpbjsKICAgICBXVEY6OlByb2Nlc3NJRCBwYXJl bnRQSUQgeyAwIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05l dHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9j ZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRQYXJhbWV0ZXJzLmgKaW5kZXggN2YxZmU4NmY2NWJiOTQw NjgxNTE0YWVhN2U2ZDNlNTgwOGUxYzNmMC4uNWQ0YmYxNWJiMTVmNGU0YTEyNDM1MDBlYWI4N2U3 YzQyZGRlMzA0YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3 b3JrUmVzb3VyY2VMb2FkUGFyYW1ldGVycy5oCisrKyBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1By b2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRlcnMuaApAQCAtNTYsNyArNTYsNyBAQCBw dWJsaWM6CiAgICAgVmVjdG9yPFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPj4gcmVxdWVzdEJvZHlT YW5kYm94RXh0ZW5zaW9uczsgLy8gQ3JlYXRlZCBhdXRvbWF0aWNhbGx5IGZvciB0aGUgc2VuZGVy LgogICAgIFJlZlB0cjxTYW5kYm94RXh0ZW5zaW9uPiByZXNvdXJjZVNhbmRib3hFeHRlbnNpb247 IC8vIENyZWF0ZWQgYXV0b21hdGljYWxseSBmb3IgdGhlIHNlbmRlci4KICAgICBtdXRhYmxlIFNl Y29uZHMgbWF4aW11bUJ1ZmZlcmluZ1RpbWU7Ci0gICAgV2ViQ29yZTo6RmV0Y2hPcHRpb25zIG9w dGlvbnM7CisgICAgbXV0YWJsZSBXZWJDb3JlOjpGZXRjaE9wdGlvbnMgb3B0aW9uczsKICAgICBz dGQ6Om9wdGlvbmFsPFdlYkNvcmU6OkNvbnRlbnRTZWN1cml0eVBvbGljeVJlc3BvbnNlSGVhZGVy cz4gY3NwUmVzcG9uc2VIZWFkZXJzOwogICAgIFdlYkNvcmU6OkNyb3NzT3JpZ2luRW1iZWRkZXJQ b2xpY3kgcGFyZW50Q3Jvc3NPcmlnaW5FbWJlZGRlclBvbGljeTsKICAgICBXZWJDb3JlOjpDcm9z c09yaWdpbkVtYmVkZGVyUG9saWN5IGNyb3NzT3JpZ2luRW1iZWRkZXJQb2xpY3k7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAgYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKaW5kZXggNTdjMWIxYjY5M2Q3MTViZTEyZWFkNmM2ZmQ1OTY1MTI5N2MzMjE1Zi4uZjM0NjUx MTMyNmFlZGMxOTUyMzFjYWUzOGY2NDJiNjVjZTNkYTZjOSAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcApAQCAtNTc2 LDEzICs1NzYsMjEgQEAgc3RkOjpvcHRpb25hbDxOZXR3b3JrTG9hZE1ldHJpY3M+IE5ldHdvcmtS ZXNvdXJjZUxvYWRlcjo6Y29tcHV0ZVJlc3BvbnNlTWV0cmljcygKICAgICByZXR1cm4gbmV0d29y a0xvYWRNZXRyaWNzOwogfQogCi12b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6dHJhbnNmZXJU b05ld1dlYlByb2Nlc3MoTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MmIG5ld0Nvbm5lY3Rp b24sIFdlYkNvcmU6OlJlc291cmNlTG9hZGVySWRlbnRpZmllciBuZXdDb3JlSWRlbnRpZmllcikK K3ZvaWQgTmV0d29ya1Jlc291cmNlTG9hZGVyOjp0cmFuc2ZlclRvTmV3V2ViUHJvY2VzcyhOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2VzcyYgbmV3Q29ubmVjdGlvbiwgY29uc3QgTmV0d29ya1Jl c291cmNlTG9hZFBhcmFtZXRlcnMmIHBhcmFtZXRlcnMpCiB7CiAgICAgbV9jb25uZWN0aW9uID0g bmV3Q29ubmVjdGlvbjsKLSAgICBtX3BhcmFtZXRlcnMuaWRlbnRpZmllciA9IG5ld0NvcmVJZGVu dGlmaWVyOworICAgIG1fcGFyYW1ldGVycy5pZGVudGlmaWVyID0gcGFyYW1ldGVycy5pZGVudGlm aWVyOworICAgIG1fcGFyYW1ldGVycy53ZWJQYWdlUHJveHlJRCA9IHBhcmFtZXRlcnMud2ViUGFn ZVByb3h5SUQ7CisgICAgbV9wYXJhbWV0ZXJzLndlYlBhZ2VJRCA9IHBhcmFtZXRlcnMud2ViUGFn ZUlEOworICAgIG1fcGFyYW1ldGVycy53ZWJGcmFtZUlEID0gcGFyYW1ldGVycy53ZWJGcmFtZUlE OworICAgIG1fcGFyYW1ldGVycy5vcHRpb25zLmNsaWVudElkZW50aWZpZXIgPSBwYXJhbWV0ZXJz Lm9wdGlvbnMuY2xpZW50SWRlbnRpZmllcjsKIAogI2lmIEVOQUJMRShTRVJWSUNFX1dPUktFUikK ICAgICBBU1NFUlQobV9yZXNwb25zZUNvbXBsZXRpb25IYW5kbGVyIHx8IG1fY2FjaGVFbnRyeVdh aXRpbmdGb3JDb250aW51ZURpZFJlY2VpdmVSZXNwb25zZSB8fCBtX3NlcnZpY2VXb3JrZXJGZXRj aFRhc2spOworICAgIGlmIChtX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24pIHsKKyAgICAgICAg aWYgKGF1dG8qIHN3Q29ubmVjdGlvbiA9IG5ld0Nvbm5lY3Rpb24uc3dDb25uZWN0aW9uKCkpCisg ICAgICAgICAgICBzd0Nvbm5lY3Rpb24tPnRyYW5zZmVyU2VydmljZVdvcmtlckxvYWRUb05ld1dl YlByb2Nlc3MoKnRoaXMsICptX3NlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb24pOworICAgIH0KICNl bHNlCiAgICAgQVNTRVJUKG1fcmVzcG9uc2VDb21wbGV0aW9uSGFuZGxlciB8fCBtX2NhY2hlRW50 cnlXYWl0aW5nRm9yQ29udGludWVEaWRSZWNlaXZlUmVzcG9uc2UpOwogI2VuZGlmCkBAIC0xMjA4 LDYgKzEyMTYsNyBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6Y29udGludWVXaWxsU2Vu ZFJlcXVlc3QoUmVzb3VyY2VSZXF1ZXN0JiYgbmV3UmVxdWVzdAogCiAjaWYgRU5BQkxFKFNFUlZJ Q0VfV09SS0VSKQogICAgIGlmIChwYXJhbWV0ZXJzKCkub3B0aW9ucy5tb2RlID09IEZldGNoT3B0 aW9uczo6TW9kZTo6TmF2aWdhdGUpIHsKKyAgICAgICAgbV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0 aW9uID0geyB9OwogICAgICAgICBpZiAoYXV0byBzZXJ2aWNlV29ya2VyRmV0Y2hUYXNrID0gbV9j b25uZWN0aW9uLT5jcmVhdGVGZXRjaFRhc2soKnRoaXMsIG5ld1JlcXVlc3QpKSB7CiAgICAgICAg ICAgICBMT0FERVJfUkVMRUFTRV9MT0coImNvbnRpbnVlV2lsbFNlbmRSZXF1ZXN0OiBDcmVhdGVk IGEgU2VydmljZVdvcmtlckZldGNoVGFzayB0byBoYW5kbGUgdGhlIHJlZGlyZWN0IChmZXRjaElk ZW50aWZpZXI9JSIgUFJJdTY0ICIpIiwgc2VydmljZVdvcmtlckZldGNoVGFzay0+ZmV0Y2hJZGVu dGlmaWVyKCkudG9VSW50NjQoKSk7CiAgICAgICAgICAgICBtX25ldHdvcmtMb2FkID0gbnVsbHB0 cjsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmggYi9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJj ZUxvYWRlci5oCmluZGV4IDJmYjlmYWQ0NTVhMzliMjAxMTc2N2JlZTM3NzE3MGMzNTc2NGNiZjAu LjAyYTg2ODU0OGQzOTE3ZTVkMzM0NzE1N2Y1MDdlNTg0MmQxZWJiODkgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVyLmgKKysrIGIv U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaApAQCAt NDAsNiArNDAsNyBAQAogI2luY2x1ZGUgPFdlYkNvcmUvQ3Jvc3NPcmlnaW5BY2Nlc3NDb250cm9s Lmg+CiAjaW5jbHVkZSA8V2ViQ29yZS9Qcml2YXRlQ2xpY2tNZWFzdXJlbWVudC5oPgogI2luY2x1 ZGUgPFdlYkNvcmUvUmVzb3VyY2VSZXNwb25zZS5oPgorI2luY2x1ZGUgPFdlYkNvcmUvU1dTZXJ2 ZXJSZWdpc3RyYXRpb24uaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NlY3VyaXR5UG9saWN5VmlvbGF0 aW9uRXZlbnQuaD4KICNpbmNsdWRlIDxXZWJDb3JlL1NoYXJlZEJ1ZmZlci5oPgogI2luY2x1ZGUg PFdlYkNvcmUvVGltZXIuaD4KQEAgLTkzLDcgKzk0LDcgQEAgcHVibGljOgogICAgIHZvaWQgc3Rh cnQoKTsKICAgICB2b2lkIGFib3J0KCk7CiAKLSAgICB2b2lkIHRyYW5zZmVyVG9OZXdXZWJQcm9j ZXNzKE5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzJiwgV2ViQ29yZTo6UmVzb3VyY2VMb2Fk ZXJJZGVudGlmaWVyKTsKKyAgICB2b2lkIHRyYW5zZmVyVG9OZXdXZWJQcm9jZXNzKE5ldHdvcmtD b25uZWN0aW9uVG9XZWJQcm9jZXNzJiwgY29uc3QgTmV0d29ya1Jlc291cmNlTG9hZFBhcmFtZXRl cnMmKTsKIAogICAgIC8vIE1lc3NhZ2UgaGFuZGxlcnMuCiAgICAgdm9pZCBkaWRSZWNlaXZlTmV0 d29ya1Jlc291cmNlTG9hZGVyTWVzc2FnZShJUEM6OkNvbm5lY3Rpb24mLCBJUEM6OkRlY29kZXIm KTsKQEAgLTE1NCw2ICsxNTUsNyBAQCBwdWJsaWM6CiAgICAgdm9pZCBzZXJ2aWNlV29ya2VyRGlk Tm90SGFuZGxlKFNlcnZpY2VXb3JrZXJGZXRjaFRhc2sqKTsKICAgICB2b2lkIHNldFJlc3VsdGlu Z0NsaWVudElkZW50aWZpZXIoU3RyaW5nJiYgaWRlbnRpZmllcikgeyBtX3Jlc3VsdGluZ0NsaWVu dElkZW50aWZpZXIgPSBXVEZNb3ZlKGlkZW50aWZpZXIpOyB9CiAgICAgY29uc3QgU3RyaW5nJiBy ZXN1bHRpbmdDbGllbnRJZGVudGlmaWVyKCkgY29uc3QgeyByZXR1cm4gbV9yZXN1bHRpbmdDbGll bnRJZGVudGlmaWVyOyB9CisgICAgdm9pZCBzZXRTZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uKFdl YkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9uJiBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uKSB7 IG1fc2VydmljZVdvcmtlclJlZ2lzdHJhdGlvbiA9IHNlcnZpY2VXb3JrZXJSZWdpc3RyYXRpb247 IH0KICNlbmRpZgogCiAgICAgc3RkOjpvcHRpb25hbDxXZWJDb3JlOjpSZXNvdXJjZUVycm9yPiBk b0Nyb3NzT3JpZ2luT3BlbmVySGFuZGxpbmdPZlJlc3BvbnNlKGNvbnN0IFdlYkNvcmU6OlJlc291 cmNlUmVzcG9uc2UmKTsKQEAgLTI4OCw2ICsyOTAsNyBAQCBwcml2YXRlOgogI2lmIEVOQUJMRShT RVJWSUNFX1dPUktFUikKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U2VydmljZVdvcmtlckZldGNoVGFz az4gbV9zZXJ2aWNlV29ya2VyRmV0Y2hUYXNrOwogICAgIFN0cmluZyBtX3Jlc3VsdGluZ0NsaWVu dElkZW50aWZpZXI7CisgICAgV2Vha1B0cjxXZWJDb3JlOjpTV1NlcnZlclJlZ2lzdHJhdGlvbj4g bV9zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uOwogI2VuZGlmCiAgICAgTmV0d29ya1Jlc291cmNl TG9hZElkZW50aWZpZXIgbV9yZXNvdXJjZUxvYWRJRDsKICAgICBXZWJDb3JlOjpSZXNvdXJjZVJl c3BvbnNlIG1fcmVkaXJlY3RSZXNwb25zZTsKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0 d29ya1Byb2Nlc3MvU2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uY3BwIGIvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVj dGlvbi5jcHAKaW5kZXggNTZiMTgwNDY5NmE1NjU0YTFmMzZhZDkzZDdkY2RlNDE0MzFkMjZjOC4u ZGI5ZDFiMjc0NDg2OWM3MGM3NmE5MzdkZDQ1ODBiODMxODlkNjZhOSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVj dGlvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2Vy L1dlYlNXU2VydmVyQ29ubmVjdGlvbi5jcHAKQEAgLTIwNCw2ICsyMDQsNyBAQCBzdGQ6OnVuaXF1 ZV9wdHI8U2VydmljZVdvcmtlckZldGNoVGFzaz4gV2ViU1dTZXJ2ZXJDb25uZWN0aW9uOjpjcmVh dGVGZXRjaFRhc2soTgogICAgICAgICBzZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRlbnRpZmll ciA9IHJlZ2lzdHJhdGlvbi0+aWRlbnRpZmllcigpOwogICAgICAgICBjb250cm9sQ2xpZW50KGxv YWRlci5wYXJhbWV0ZXJzKCksICpyZWdpc3RyYXRpb24sIHJlcXVlc3QpOwogICAgICAgICBsb2Fk ZXIuc2V0UmVzdWx0aW5nQ2xpZW50SWRlbnRpZmllcihsb2FkZXIucGFyYW1ldGVycygpLm9wdGlv bnMuY2xpZW50SWRlbnRpZmllci0+dG9TdHJpbmcoKSk7CisgICAgICAgIGxvYWRlci5zZXRTZXJ2 aWNlV29ya2VyUmVnaXN0cmF0aW9uKCpyZWdpc3RyYXRpb24pOwogICAgIH0gZWxzZSB7CiAgICAg ICAgIGlmICghbG9hZGVyLnBhcmFtZXRlcnMoKS5zZXJ2aWNlV29ya2VyUmVnaXN0cmF0aW9uSWRl bnRpZmllcikKICAgICAgICAgICAgIHJldHVybiBudWxscHRyOwpAQCAtNjY2LDYgKzY2NywxMSBA QCB2b2lkIFdlYlNXU2VydmVyQ29ubmVjdGlvbjo6Zm9jdXNTZXJ2aWNlV29ya2VyQ2xpZW50KFdl YkNvcmU6OlNjcmlwdEV4ZWN1dGlvbkNvbgogICAgIHNlbmRXaXRoQXN5bmNSZXBseShNZXNzYWdl czo6V2ViU1dDbGllbnRDb25uZWN0aW9uOjpGb2N1c1NlcnZpY2VXb3JrZXJDbGllbnQgeyBjbGll bnRJZGVudGlmaWVyIH0sIFdURk1vdmUoY2FsbGJhY2spKTsKIH0KIAordm9pZCBXZWJTV1NlcnZl ckNvbm5lY3Rpb246OnRyYW5zZmVyU2VydmljZVdvcmtlckxvYWRUb05ld1dlYlByb2Nlc3MoTmV0 d29ya1Jlc291cmNlTG9hZGVyJiBsb2FkZXIsIFdlYkNvcmU6OlNXU2VydmVyUmVnaXN0cmF0aW9u JiByZWdpc3RyYXRpb24pCit7CisgICAgY29udHJvbENsaWVudChsb2FkZXIucGFyYW1ldGVycygp LCByZWdpc3RyYXRpb24sIGxvYWRlci5vcmlnaW5hbFJlcXVlc3QoKSk7Cit9CisKIH0gLy8gbmFt ZXNwYWNlIFdlYktpdAogCiAjdW5kZWYgQ09OTkVDVElPTl9NRVNTQUdFX0NIRUNLX0NPTVBMRVRJ T04KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvU2VydmljZVdvcmtl ci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaCBiL1NvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3Mv U2VydmljZVdvcmtlci9XZWJTV1NlcnZlckNvbm5lY3Rpb24uaAppbmRleCA0ZGMzMTQ1Y2JmYjhl M2Q1YzVlZWNmZmNmOTc1MTA1MTVmNGY0YWJjLi5iMGRiODViYzY3YWUwZGU1YjA3NGFkOWRmZjAy M2U2YWMxZWJmYjAwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL1Nl cnZpY2VXb3JrZXIvV2ViU1dTZXJ2ZXJDb25uZWN0aW9uLmgKKysrIGIvU291cmNlL1dlYktpdC9O ZXR3b3JrUHJvY2Vzcy9TZXJ2aWNlV29ya2VyL1dlYlNXU2VydmVyQ29ubmVjdGlvbi5oCkBAIC04 NCw2ICs4NCw4IEBAIHB1YmxpYzoKICAgICBzdGQ6OnVuaXF1ZV9wdHI8U2VydmljZVdvcmtlckZl dGNoVGFzaz4gY3JlYXRlRmV0Y2hUYXNrKE5ldHdvcmtSZXNvdXJjZUxvYWRlciYsIGNvbnN0IFdl YkNvcmU6OlJlc291cmNlUmVxdWVzdCYpOwogICAgIHZvaWQgZmV0Y2hUYXNrVGltZWRPdXQoV2Vi Q29yZTo6U2VydmljZVdvcmtlcklkZW50aWZpZXIpOwogCisgICAgdm9pZCB0cmFuc2ZlclNlcnZp Y2VXb3JrZXJMb2FkVG9OZXdXZWJQcm9jZXNzKE5ldHdvcmtSZXNvdXJjZUxvYWRlciYsIFdlYkNv cmU6OlNXU2VydmVyUmVnaXN0cmF0aW9uJik7CisKIHByaXZhdGU6CiAgICAgLy8gSW1wbGVtZW50 IFNXU2VydmVyOjpDb25uZWN0aW9uIChNZXNzYWdlcyB0byB0aGUgY2xpZW50IFdlYlByb2Nlc3Mp CiAgICAgdm9pZCByZWplY3RKb2JJbkNsaWVudChXZWJDb3JlOjpTZXJ2aWNlV29ya2VySm9iSWRl bnRpZmllciwgY29uc3QgV2ViQ29yZTo6RXhjZXB0aW9uRGF0YSYpIGZpbmFsOwpkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGFhZWJkMDY3NTQyZGJk ZmYxMzg0ZTU0NDkwZDljYTE4YzdmYzRhNTIuLmNhMDA0MjgwNzg0OTQ4MDFlNmNiMzNhZjdiOTE0 MTg4NmQ2NmJkMGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMi0wNC0wNSAgWW91ZW5uIEZhYmxldCAgPHlvdWVu bkBhcHBsZS5jb20+CisKKyAgICAgICAgSW4gY2FzZSBvZiBDT09QLWJhc2VkIHByb2Nlc3Mgc3dh cCwgd2UgbmVlZCB0byBtYWtlIHN1cmUgdGhlIGRvY3VtZW50IGdldHMgY29udHJvbGxlZCBieSBp dHMgbWF0Y2hpbmcgc2VydmljZSB3b3JrZXIgcmVnaXN0cmF0aW9uCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzg4MDAKKyAgICAgICAgPHJkYXI6Ly9w cm9ibGVtLzkxMjg4ODQ5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TZXJ2aWNlV29ya2Vy QmFzaWMubW06CisKIDIwMjItMDQtMDUgIFlvdWVubiBGYWJsZXQgIDx5b3Vlbm5AYXBwbGUuY29t PgogCiAgICAgICAgIEltcGxlbWVudCBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50Lm5hdmlnYXRl CmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NlcnZp Y2VXb3JrZXJCYXNpYy5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev U2VydmljZVdvcmtlckJhc2ljLm1tCmluZGV4IDdhOTA1YmVlNTM3Y2Y2ZjJlODMwZWE0NmNmN2I5 M2Q3YTNhODY2NjYuLmQ2NWJiZTE5ZTExZWEzMDU2ZmRjZDZmYTdkZGMyMzJmNDVjZTA1MjcgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvU2VydmljZVdv cmtlckJhc2ljLm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2Ev U2VydmljZVdvcmtlckJhc2ljLm1tCkBAIC0yOTk2LDYgKzI5OTYsMTMgQEAgc3RhdGljIGNvbnN0 ZXhwciBhdXRvIFNlcnZpY2VXb3JrZXJXaW5kb3dDbGllbnROYXZpZ2F0ZU1haW4gPQogIiAgICAg ICAgYWxlcnQoZXZlbnQuZGF0YSk7IgogIiAgICB9OyIKICJ9IgorIiIKKyJmdW5jdGlvbiBjb3Vu dFNlcnZpY2VXb3JrZXJDbGllbnRzKCkgeyIKKyIgICAgd29ya2VyLnBvc3RNZXNzYWdlKCdjb3Vu dFNlcnZpY2VXb3JrZXJDbGllbnRzJyk7IgorIiAgICBuYXZpZ2F0b3Iuc2VydmljZVdvcmtlci5v bm1lc3NhZ2UgPSAoZXZlbnQpID0+IHsiCisiICAgICAgICBhbGVydChldmVudC5kYXRhKTsiCisi ICAgIH07IgorIn0iCiAiPC9zY3JpcHQ+Il9zOwogCiBzdGF0aWMgY29uc3RleHByIGF1dG8gU2Vy dmljZVdvcmtlcldpbmRvd0NsaWVudE5hdmlnYXRlSlMgPQpAQCAtMzAxOCw2ICszMDI1LDExIEBA IHN0YXRpYyBjb25zdGV4cHIgYXV0byBTZXJ2aWNlV29ya2VyV2luZG93Q2xpZW50TmF2aWdhdGVK UyA9CiAiICAgICAgIH0pOyIKICIgICAgICAgcmV0dXJuOyIKICIgICB9IgorIiAgIGlmIChldmVu dC5kYXRhID09PSAnY291bnRTZXJ2aWNlV29ya2VyQ2xpZW50cycpIHsiCisiICAgICAgIGxldCBj dXJyZW50Q2xpZW50cyA9IGF3YWl0IHNlbGYuY2xpZW50cy5tYXRjaEFsbCgpOyIKKyIgICAgICAg ZXZlbnQuc291cmNlLnBvc3RNZXNzYWdlKGN1cnJlbnRDbGllbnRzLmxlbmd0aCArICcgY2xpZW50 KHMpJyk7IgorIiAgICAgICByZXR1cm47IgorIiAgIH0iCiAifSk7Il9zOwogCiAKQEAgLTMwOTgs NiArMzExMCw5IEBAIFRFU1QoU2VydmljZVdvcmtlciwgV2luZG93Q2xpZW50TmF2aWdhdGUpCiAK ICAgICBbd2ViVmlldzEgZXZhbHVhdGVKYXZhU2NyaXB0OltOU1N0cmluZyBzdHJpbmdXaXRoRm9y bWF0OkAibmF2aWdhdGVPdGhlckNsaWVudFRvVVJMKCclQD9zd2FwJykiLCBiYXNlVVJMXSBjb21w bGV0aW9uSGFuZGxlcjogbmlsXTsKICAgICBFWFBFQ1RfV0tfU1RSRVEoW3dlYlZpZXcxIF90ZXN0 X3dhaXRGb3JBbGVydF0sICJjbGllbnQiKTsKKworICAgIFt3ZWJWaWV3MSBldmFsdWF0ZUphdmFT Y3JpcHQ6QCJjb3VudFNlcnZpY2VXb3JrZXJDbGllbnRzKCkiIGNvbXBsZXRpb25IYW5kbGVyOiBu aWxdOworICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmlldzEgX3Rlc3Rfd2FpdEZvckFsZXJ0XSwg IjEgY2xpZW50KHMpIik7CiB9CiAKIFRFU1QoU2VydmljZVdvcmtlciwgV2luZG93Q2xpZW50TmF2 aWdhdGVDcm9zc09yaWdpbikK