233191 2021-11-16 08:02:56 -0800 [iOS] Do not require the web browser entitlement to opt into captive portal mode 2021-11-16 10:29:35 -0800 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 cdumez cdumez bfulgham ggaren kkinnunen webkit-bug-importer oldest_to_newest 1815485 0 cdumez 2021-11-16 08:02:56 -0800 Do not require the web browser entitlement to opt into captive portal mode on iOS, only require it to opt out. 1815486 1 444385 cdumez 2021-11-16 08:04:50 -0800 Created attachment 444385 Patch 1815488 2 444385 bfulgham 2021-11-16 08:08:05 -0800 Comment on attachment 444385 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=444385&action=review r=me > Tools/TestWebKitAPI/Tests/WebKitCocoa/ProcessSwapOnNavigation.mm:7750 > + [preferences _setCaptivePortalModeEnabled:NO]; Nit: Whitespace is wrong here. 1815493 3 444388 cdumez 2021-11-16 08:14:33 -0800 Created attachment 444388 Patch 1815497 4 444388 bfulgham 2021-11-16 08:21:29 -0800 Comment on attachment 444388 Patch Thank you! 1815552 5 ews-feeder 2021-11-16 10:28:04 -0800 Committed r285873 (244299@main): <https://commits.webkit.org/244299@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 444388. 1815554 6 webkit-bug-importer 2021-11-16 10:29:35 -0800 <rdar://problem/85464810> 444385 2021-11-16 08:04:50 -0800 2021-11-16 08:14:31 -0800 Patch bug-233191-20211116080449.patch text/plain 6473 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0NWU0OGQyODBiMzZkYWVk ZTYxOWI3MmZlYzdjZDhjNmI4YmZiNzguLmI4MzBhZjgyOTU5NWM5YzMwNmQ1Mzc3Y2UwYjg4ODQx ZGRmZmI2N2EgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEbyBub3QgcmVxdWlyZSB0 aGUgd2ViIGJyb3dzZXIgZW50aXRsZW1lbnQgdG8gb3B0IGludG8gY2FwdGl2ZSBwb3J0YWwgbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMTkx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRG8gbm90 IHJlcXVpcmUgdGhlIHdlYiBicm93c2VyIGVudGl0bGVtZW50IHRvIG9wdCBpbnRvIGNhcHRpdmUg cG9ydGFsIG1vZGUgb24gaU9TLCBvbmx5IHJlcXVpcmUKKyAgICAgICAgaXQgdG8gb3B0IG91dC4K KworICAgICAgICAqIFVJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJwYWdlUHJlZmVyZW5jZXMubW06 CisgICAgICAgICgtW1dLV2VicGFnZVByZWZlcmVuY2VzIF9zZXRDYXB0aXZlUG9ydGFsTW9kZUVu YWJsZWQ6XSk6CisKIDIwMjEtMTEtMTYgIEtpbW1vIEtpbm51bmVuICA8a2tpbm51bmVuQGFwcGxl LmNvbT4KIAogICAgICAgICBSZW1vdGVHcmFwaGljc0NvbnRleHRHTENvY29hOjptX3N3YXBDaGFp biBpcyB1bnVzZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2Nv YS9XS1dlYnBhZ2VQcmVmZXJlbmNlcy5tbSBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYnBhZ2VQcmVmZXJlbmNlcy5tbQppbmRleCA0ZmYxOWY2ZTFhMTU1NmM4Njk4OTcw MGE3N2VkMWYzYjExMzNmNmViLi4yMDgxMGMzNzVkNGFhMTU0ZDBiNmEyYWI0YjA2ZDQxZjAyY2M2 NDU1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJw YWdlUHJlZmVyZW5jZXMubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2VicGFnZVByZWZlcmVuY2VzLm1tCkBAIC0zOTMsMTAgKzM5MywxNSBAQCAtIChCT09MKWFs bG93c0NvbnRlbnRKYXZhU2NyaXB0CiAKIC0gKHZvaWQpX3NldENhcHRpdmVQb3J0YWxNb2RlRW5h YmxlZDooQk9PTCljYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQKIHsKLSNpZiBQTEFURk9STShJT1Nf RkFNSUxZKQotICAgIGlmICghV1RGOjpwcm9jZXNzSGFzRW50aXRsZW1lbnQoImNvbS5hcHBsZS5k ZXZlbG9wZXIud2ViLWJyb3dzZXIiKSkKKyAgICBpZiAoX3dlYnNpdGVQb2xpY2llcy0+Y2FwdGl2 ZVBvcnRhbE1vZGVFbmFibGVkKCkgPT0gY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKQogICAgICAg ICByZXR1cm47CisKKyNpZiBQTEFURk9STShJT1NfRkFNSUxZKQorICAgIC8vIE9uIGlPUywgdGhl IHdlYiBicm93c2VyIGVudGl0bGVtZW50IGlzIHJlcXVpcmVkIHRvIGRpc2FibGUgY2FwdGl2ZSBw b3J0YWwgbW9kZS4KKyAgICBpZiAoIWNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCAmJiAhV1RGOjpw cm9jZXNzSGFzRW50aXRsZW1lbnQoImNvbS5hcHBsZS5kZXZlbG9wZXIud2ViLWJyb3dzZXIiKSkK KyAgICAgICAgW05TRXhjZXB0aW9uIHJhaXNlOk5TSW50ZXJuYWxJbmNvbnNpc3RlbmN5RXhjZXB0 aW9uIGZvcm1hdDpAIlRoZSAnY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlcicgcmVzdHJp Y3RlZCBlbnRpdGxlbWVudCBpcyByZXF1aXJlZCB0byBkaXNhYmxlIGNhcHRpdmUgcG9ydGFsIG1v ZGUiXTsKICNlbmRpZgorCiAgICAgX3dlYnNpdGVQb2xpY2llcy0+c2V0Q2FwdGl2ZVBvcnRhbE1v ZGVFbmFibGVkKCEhY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKIH0KIApkaWZmIC0tZ2l0IGEv VG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDBjZjkyNDM4ZDFkNDcyYjdk MjdjMDgxZmMyMjkzMjdhZGE4YjcyMTcuLmFkYmRmMzEwZjk0MGFkYzE1YjllMGU5ZjY3NjcxZGUw OWMwNjgwNDggMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VM b2cKQEAgLTEsMyArMSwxNCBAQAorMjAyMS0xMS0xNiAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBw bGUuY29tPgorCisgICAgICAgIFtpT1NdIERvIG5vdCByZXF1aXJlIHRoZSB3ZWIgYnJvd3NlciBl bnRpdGxlbWVudCB0byBvcHQgaW50byBjYXB0aXZlIHBvcnRhbCBtb2RlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMxOTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVcGRhdGUgQVBJIHRlc3QgY292ZXJh Z2UgYWNjb3JkaW5nbHkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tOgorCiAyMDIxLTExLTE2ICBUeWxlciBXaWxj b2NrICA8dHlsZXJfd0BhcHBsZS5jb20+CiAKICAgICAgICAgQVg6IFN0b3AgcmV0dXJuaW5nIEFj Y2Vzc2liaWxpdHlVSUVsZW1lbnRzIGJhY2tlZCBieSBhIG51bGwgcG9pbnRlcgpkaWZmIC0tZ2l0 IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dhcE9uTmF2 aWdhdGlvbi5tbSBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vz c1N3YXBPbk5hdmlnYXRpb24ubW0KaW5kZXggNzM4NTIxN2YwZjdkZjk4NTNjNzM3ZjQ4MmNjMGZj MDhmNzc1NjNmYi4uYzVjYTUxZWZjNDhlYTI0MDBiNzdjMDAwMDM5NjQzZGQ4ZWQ0NDUzZCAxMDA2 NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9Qcm9jZXNzU3dh cE9uTmF2aWdhdGlvbi5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENv Y29hL1Byb2Nlc3NTd2FwT25OYXZpZ2F0aW9uLm1tCkBAIC03NjI2LDEwICs3NjI2LDYgQEAgVEVT VChQcm9jZXNzU3dhcCwgTmF2aWdhdGluZ0Nyb3NzT3JpZ2luRnJvbUNPT1BTYW1lT3JpZ2luQWxs b3dQb3B1cDQpCiAgICAgcnVuQ09PUFByb2Nlc3NTd2FwVGVzdCgic2FtZS1vcmlnaW4tYWxsb3ct cG9wdXAiLCAidW5zYWZlLW5vbmUiLCAidW5zYWZlLW5vbmUiLCAidW5zYWZlLW5vbmUiLCBJc1Nh bWVPcmlnaW46Ok5vLCBEb1NlcnZlclNpZGVSZWRpcmVjdDo6Tm8sIEV4cGVjdFN3YXA6Ok5vKTsK IH0KIAotLy8gT24gaU9TLCB0b2dnbGluZyB0aGUgY2FwdGl2ZSBwb3J0YWwgbW9kZSByZXF1aXJl cyB0aGUgYnJvd3NlciBlbnRpdGxlbWVudCwgd2hpY2ggVGVzdFdlYktpdCBBUEkgZG9lc24ndCBo YXZlLgotLy8gQWxzbywgc29tZSBBUEkgdGVzdHMgcmVseSBvbiB0aGUgYnJvd3NlciBlbnRpdGxl bWVudCBub3QgYmVpbmcgcHJlc2VudC4KLSNpZiAhUExBVEZPUk0oSU9TKQotCiBzdGF0aWMgYm9v bCBpc0pJVEVuYWJsZWQoV0tXZWJWaWV3ICp3ZWJWaWV3KQogewogICAgIF9fYmxvY2sgYm9vbCBn b3RSZXNwb25zZSA9IGZhbHNlOwpAQCAtNzcyMyw2ICs3NzE5LDUzIEBAIFRFU1QoUHJvY2Vzc1N3 YXAsIE5hdmlnYXRpbmdUb0NhcHRpdmVQb3J0YWxNb2RlKQogICAgIGNoZWNrU2V0dGluZ3NDb250 cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJsZWQ6 Ok5vKTsKIH0KIAorI2lmIFBMQVRGT1JNKElPUykKKworVEVTVChQcm9jZXNzU3dhcCwgQ2Fubm90 RGlzYWJsZUNhcHRpdmVQb3J0YWxNb2RlV2l0aG91dEJyb3dzZXJFbnRpdGxlbWVudCkKK3sKKyAg ICBhdXRvIHdlYlZpZXdDb25maWd1cmF0aW9uID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJh dGlvbiBuZXddKTsKKyAgICBFWFBFQ1RfRkFMU0Uod2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCku ZGVmYXVsdFdlYnBhZ2VQcmVmZXJlbmNlcy5fY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKKyAg ICBbd2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkuZGVmYXVsdFdlYnBhZ2VQcmVmZXJlbmNlcyBf c2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkOllFU107CisgICAgW3dlYlZpZXdDb25maWd1cmF0 aW9uLmdldCgpLnByZWZlcmVuY2VzIF9zZXRNZWRpYURldmljZXNFbmFibGVkOllFU107CisgICAg d2ViVmlld0NvbmZpZ3VyYXRpb24uZ2V0KCkucHJlZmVyZW5jZXMuX21lZGlhQ2FwdHVyZVJlcXVp cmVzU2VjdXJlQ29ubmVjdGlvbiA9IE5POworCisgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhb W1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpOU01ha2VSZWN0KDAsIDAsIDgwMCwgNjAw KSBjb25maWd1cmF0aW9uOndlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpXSk7CisgICAgYXV0byBk ZWxlZ2F0ZSA9IGFkb3B0TlMoW1Rlc3ROYXZpZ2F0aW9uRGVsZWdhdGUgbmV3XSk7CisgICAgW3dl YlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOmRlbGVnYXRlLmdldCgpXTsKKworICAgIEVYUEVD VF9GQUxTRShpc0pJVEVuYWJsZWQod2ViVmlldy5nZXQoKSkpOworICAgIGNoZWNrU2V0dGluZ3ND b250cm9sbGVkQnlDYXB0aXZlUG9ydGFsTW9kZSh3ZWJWaWV3LmdldCgpLCBTaG91bGRCZUVuYWJs ZWQ6Ok5vLCBJc1Nob3dpbmdJbml0aWFsRW1wdHlEb2N1bWVudDo6WWVzKTsKKyAgICBwaWRfdCBw aWQxID0gW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVudGlmaWVyXTsKKworICAgIF9fYmxvY2sgYm9v bCBmaW5pc2hlZE5hdmlnYXRpb24gPSBmYWxzZTsKKyAgICBkZWxlZ2F0ZS5nZXQoKS5kaWRGaW5p c2hOYXZpZ2F0aW9uID0gXihXS1dlYlZpZXcgKiwgV0tOYXZpZ2F0aW9uICopIHsKKyAgICAgICAg ZmluaXNoZWROYXZpZ2F0aW9uID0gdHJ1ZTsKKyAgICB9OworCisgICAgZGVsZWdhdGUuZ2V0KCku ZGVjaWRlUG9saWN5Rm9yTmF2aWdhdGlvbkFjdGlvbldpdGhQcmVmZXJlbmNlcyA9IF4oV0tOYXZp Z2F0aW9uQWN0aW9uICphY3Rpb24sIFdLV2VicGFnZVByZWZlcmVuY2VzICpwcmVmZXJlbmNlcywg dm9pZCAoXmNvbXBsZXRpb25IYW5kbGVyKShXS05hdmlnYXRpb25BY3Rpb25Qb2xpY3ksIFdLV2Vi cGFnZVByZWZlcmVuY2VzICopKSB7CisgICAgICAgIEVYUEVDVF9UUlVFKHByZWZlcmVuY2VzLl9j YXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOworICAgICAgICBib29sIGRpZFRocm93V2hlblRyeWlu Z1RvRGlzYWJsZUNhcHRpdmVQb3J0YWxNb2RlID0gZmFsc2U7CisgICAgICAgIC8vIFRlc3RXZWJL aXRBUEkgZG9lc24ndCBoYXZlIHRoZSB3ZWIgYnJvd3NlciBlbnRpdGxlbWVudCBhbmQgdGh1cyBz aG91bGRuJ3QgYmUgYWJsZSB0byBkaXNhYmxlIGNhcHRpdmUgcG9ydGFsIG1vZGUuCisgICAgICAg IEB0cnkgeworICAgICAgICBbcHJlZmVyZW5jZXMgX3NldENhcHRpdmVQb3J0YWxNb2RlRW5hYmxl ZDpOT107CisgICAgICAgIH0gQGNhdGNoIChOU0V4Y2VwdGlvbiAqZXhjZXB0aW9uKSB7CisgICAg ICAgICAgICBkaWRUaHJvd1doZW5UcnlpbmdUb0Rpc2FibGVDYXB0aXZlUG9ydGFsTW9kZSA9IHRy dWU7CisgICAgICAgIH0KKyAgICAgICAgRVhQRUNUX1RSVUUoZGlkVGhyb3dXaGVuVHJ5aW5nVG9E aXNhYmxlQ2FwdGl2ZVBvcnRhbE1vZGUpOworICAgICAgICBjb21wbGV0aW9uSGFuZGxlcihXS05h dmlnYXRpb25BY3Rpb25Qb2xpY3lBbGxvdywgcHJlZmVyZW5jZXMpOworICAgIH07CisKKyAgICBO U1VSTCAqdXJsID0gW1tOU0J1bmRsZSBtYWluQnVuZGxlXSBVUkxGb3JSZXNvdXJjZTpAInNpbXBs ZSIgd2l0aEV4dGVuc2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVz b3VyY2VzIl07CisgICAgW3dlYlZpZXcgbG9hZFJlcXVlc3Q6W05TVVJMUmVxdWVzdCByZXF1ZXN0 V2l0aFVSTDp1cmxdXTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmZpbmlzaGVkTmF2 aWdhdGlvbik7CisKKyAgICBFWFBFQ1RfRVEocGlkMSwgW3dlYlZpZXcgX3dlYlByb2Nlc3NJZGVu dGlmaWVyXSk7IC8vIFNob3VsZG4ndCBoYXZlIHByb2Nlc3Mtc3dhcHBlZCBzaW5jZSB3ZSdyZSBz dGF5aW5nIGluIGNhcHRpdmUgcG9ydGFsIG1vZGUuCisgICAgRVhQRUNUX0ZBTFNFKGlzSklURW5h YmxlZCh3ZWJWaWV3LmdldCgpKSk7CisgICAgY2hlY2tTZXR0aW5nc0NvbnRyb2xsZWRCeUNhcHRp dmVQb3J0YWxNb2RlKHdlYlZpZXcuZ2V0KCksIFNob3VsZEJlRW5hYmxlZDo6Tm8pOworfQorCisj ZWxzZQorCiBURVNUKFByb2Nlc3NTd2FwLCBDYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWRCeURlZmF1 bHRUaGVuT3B0T3V0KQogewogICAgIGF1dG8gd2ViVmlld0NvbmZpZ3VyYXRpb24gPSBhZG9wdE5T KFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIG5ld10pOwo= 444388 2021-11-16 08:14:33 -0800 2021-11-16 10:28:06 -0800 Patch bug-233191-20211116081432.patch text/plain 6475 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODYxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGU0NWU0OGQyODBiMzZkYWVk ZTYxOWI3MmZlYzdjZDhjNmI4YmZiNzguLjM1NWVmYWY5Yzc1Y2U4YmJmYjRkMzZiZjliMzQyMWQx ODI4YmY3NTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTEtMTYgIENocmlzIER1 bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KKworICAgICAgICBbaU9TXSBEbyBub3QgcmVxdWlyZSB0 aGUgd2ViIGJyb3dzZXIgZW50aXRsZW1lbnQgdG8gb3B0IGludG8gY2FwdGl2ZSBwb3J0YWwgbW9k ZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMzMTkx CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQnJlbnQgRnVsZ2hhbS4KKworICAgICAgICBEbyBub3Qg cmVxdWlyZSB0aGUgd2ViIGJyb3dzZXIgZW50aXRsZW1lbnQgdG8gb3B0IGludG8gY2FwdGl2ZSBw b3J0YWwgbW9kZSBvbiBpT1MsIG9ubHkgcmVxdWlyZQorICAgICAgICBpdCB0byBvcHQgb3V0Lgor CisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnBhZ2VQcmVmZXJlbmNlcy5tbToK KyAgICAgICAgKC1bV0tXZWJwYWdlUHJlZmVyZW5jZXMgX3NldENhcHRpdmVQb3J0YWxNb2RlRW5h YmxlZDpdKToKKwogMjAyMS0xMS0xNiAgS2ltbW8gS2lubnVuZW4gIDxra2lubnVuZW5AYXBwbGUu Y29tPgogCiAgICAgICAgIFJlbW90ZUdyYXBoaWNzQ29udGV4dEdMQ29jb2E6Om1fc3dhcENoYWlu IGlzIHVudXNlZApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0NvY29h L1dLV2VicGFnZVByZWZlcmVuY2VzLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQVBJL0Nv Y29hL1dLV2VicGFnZVByZWZlcmVuY2VzLm1tCmluZGV4IDRmZjE5ZjZlMWExNTU2Yzg2OTg5NzAw YTc3ZWQxZjNiMTEzM2Y2ZWIuLjIwODEwYzM3NWQ0YWExNTRkMGI2YTJhYjRiMDZkNDFmMDJjYzY0 NTUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYnBh Z2VQcmVmZXJlbmNlcy5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2Ev V0tXZWJwYWdlUHJlZmVyZW5jZXMubW0KQEAgLTM5MywxMCArMzkzLDE1IEBAIC0gKEJPT0wpYWxs b3dzQ29udGVudEphdmFTY3JpcHQKIAogLSAodm9pZClfc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFi bGVkOihCT09MKWNhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZAogewotI2lmIFBMQVRGT1JNKElPU19G QU1JTFkpCi0gICAgaWYgKCFXVEY6OnByb2Nlc3NIYXNFbnRpdGxlbWVudCgiY29tLmFwcGxlLmRl dmVsb3Blci53ZWItYnJvd3NlciIpKQorICAgIGlmIChfd2Vic2l0ZVBvbGljaWVzLT5jYXB0aXZl UG9ydGFsTW9kZUVuYWJsZWQoKSA9PSBjYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpCiAgICAgICAg IHJldHVybjsKKworI2lmIFBMQVRGT1JNKElPU19GQU1JTFkpCisgICAgLy8gT24gaU9TLCB0aGUg d2ViIGJyb3dzZXIgZW50aXRsZW1lbnQgaXMgcmVxdWlyZWQgdG8gZGlzYWJsZSBjYXB0aXZlIHBv cnRhbCBtb2RlLgorICAgIGlmICghY2FwdGl2ZVBvcnRhbE1vZGVFbmFibGVkICYmICFXVEY6OnBy b2Nlc3NIYXNFbnRpdGxlbWVudCgiY29tLmFwcGxlLmRldmVsb3Blci53ZWItYnJvd3NlciIpKQor ICAgICAgICBbTlNFeGNlcHRpb24gcmFpc2U6TlNJbnRlcm5hbEluY29uc2lzdGVuY3lFeGNlcHRp b24gZm9ybWF0OkAiVGhlICdjb20uYXBwbGUuZGV2ZWxvcGVyLndlYi1icm93c2VyJyByZXN0cmlj dGVkIGVudGl0bGVtZW50IGlzIHJlcXVpcmVkIHRvIGRpc2FibGUgY2FwdGl2ZSBwb3J0YWwgbW9k ZSJdOwogI2VuZGlmCisKICAgICBfd2Vic2l0ZVBvbGljaWVzLT5zZXRDYXB0aXZlUG9ydGFsTW9k ZUVuYWJsZWQoISFjYXB0aXZlUG9ydGFsTW9kZUVuYWJsZWQpOwogfQogCmRpZmYgLS1naXQgYS9U b29scy9DaGFuZ2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMGNmOTI0MzhkMWQ0NzJiN2Qy N2MwODFmYzIyOTMyN2FkYThiNzIxNy4uY2VlZGZiNmU2NjIwZWJmMjdiNzBiOGQ2MGQxODNmZmJl MGIwNzRhYyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE0IEBACisyMDIxLTExLTE2ICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKKyAgICAgICAgW2lPU10gRG8gbm90IHJlcXVpcmUgdGhlIHdlYiBicm93c2VyIGVu dGl0bGVtZW50IHRvIG9wdCBpbnRvIGNhcHRpdmUgcG9ydGFsIG1vZGUKKyAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMzE5MQorCisgICAgICAgIFJldmll d2VkIGJ5IEJyZW50IEZ1bGdoYW0uCisKKyAgICAgICAgVXBkYXRlIEFQSSB0ZXN0IGNvdmVyYWdl IGFjY29yZGluZ2x5LgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbToKKwogMjAyMS0xMS0xNiAgVHlsZXIgV2lsY29j ayAgPHR5bGVyX3dAYXBwbGUuY29tPgogCiAgICAgICAgIEFYOiBTdG9wIHJldHVybmluZyBBY2Nl c3NpYmlsaXR5VUlFbGVtZW50cyBiYWNrZWQgYnkgYSBudWxsIHBvaW50ZXIKZGlmZiAtLWdpdCBh L1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBPbk5hdmln YXRpb24ubW0gYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb2Nlc3NT d2FwT25OYXZpZ2F0aW9uLm1tCmluZGV4IDczODUyMTdmMGY3ZGY5ODUzYzczN2Y0ODJjYzBmYzA4 Zjc3NTYzZmIuLjJhMDg0Y2JkNDg2MGY0NDBjZThhMjMxNzhjMWIyM2MyMjRhYWY1ZTMgMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJvY2Vzc1N3YXBP bk5hdmlnYXRpb24ubW0KKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm9jZXNzU3dhcE9uTmF2aWdhdGlvbi5tbQpAQCAtNzYyNiwxMCArNzYyNiw2IEBAIFRFU1Qo UHJvY2Vzc1N3YXAsIE5hdmlnYXRpbmdDcm9zc09yaWdpbkZyb21DT09QU2FtZU9yaWdpbkFsbG93 UG9wdXA0KQogICAgIHJ1bkNPT1BQcm9jZXNzU3dhcFRlc3QoInNhbWUtb3JpZ2luLWFsbG93LXBv cHVwIiwgInVuc2FmZS1ub25lIiwgInVuc2FmZS1ub25lIiwgInVuc2FmZS1ub25lIiwgSXNTYW1l T3JpZ2luOjpObywgRG9TZXJ2ZXJTaWRlUmVkaXJlY3Q6Ok5vLCBFeHBlY3RTd2FwOjpObyk7CiB9 CiAKLS8vIE9uIGlPUywgdG9nZ2xpbmcgdGhlIGNhcHRpdmUgcG9ydGFsIG1vZGUgcmVxdWlyZXMg dGhlIGJyb3dzZXIgZW50aXRsZW1lbnQsIHdoaWNoIFRlc3RXZWJLaXQgQVBJIGRvZXNuJ3QgaGF2 ZS4KLS8vIEFsc28sIHNvbWUgQVBJIHRlc3RzIHJlbHkgb24gdGhlIGJyb3dzZXIgZW50aXRsZW1l bnQgbm90IGJlaW5nIHByZXNlbnQuCi0jaWYgIVBMQVRGT1JNKElPUykKLQogc3RhdGljIGJvb2wg aXNKSVRFbmFibGVkKFdLV2ViVmlldyAqd2ViVmlldykKIHsKICAgICBfX2Jsb2NrIGJvb2wgZ290 UmVzcG9uc2UgPSBmYWxzZTsKQEAgLTc3MjMsNiArNzcxOSw1MyBAQCBURVNUKFByb2Nlc3NTd2Fw LCBOYXZpZ2F0aW5nVG9DYXB0aXZlUG9ydGFsTW9kZSkKICAgICBjaGVja1NldHRpbmdzQ29udHJv bGxlZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpO byk7CiB9CiAKKyNpZiBQTEFURk9STShJT1MpCisKK1RFU1QoUHJvY2Vzc1N3YXAsIENhbm5vdERp c2FibGVDYXB0aXZlUG9ydGFsTW9kZVdpdGhvdXRCcm93c2VyRW50aXRsZW1lbnQpCit7CisgICAg YXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRp b24gbmV3XSk7CisgICAgRVhQRUNUX0ZBTFNFKHdlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLmRl ZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMuX2NhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZCk7CisgICAg W3dlYlZpZXdDb25maWd1cmF0aW9uLmdldCgpLmRlZmF1bHRXZWJwYWdlUHJlZmVyZW5jZXMgX3Nl dENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZDpZRVNdOworICAgIFt3ZWJWaWV3Q29uZmlndXJhdGlv bi5nZXQoKS5wcmVmZXJlbmNlcyBfc2V0TWVkaWFEZXZpY2VzRW5hYmxlZDpZRVNdOworICAgIHdl YlZpZXdDb25maWd1cmF0aW9uLmdldCgpLnByZWZlcmVuY2VzLl9tZWRpYUNhcHR1cmVSZXF1aXJl c1NlY3VyZUNvbm5lY3Rpb24gPSBOTzsKKworICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1tX S1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6TlNNYWtlUmVjdCgwLCAwLCA4MDAsIDYwMCkg Y29uZmlndXJhdGlvbjp3ZWJWaWV3Q29uZmlndXJhdGlvbi5nZXQoKV0pOworICAgIGF1dG8gZGVs ZWdhdGUgPSBhZG9wdE5TKFtUZXN0TmF2aWdhdGlvbkRlbGVnYXRlIG5ld10pOworICAgIFt3ZWJW aWV3IHNldE5hdmlnYXRpb25EZWxlZ2F0ZTpkZWxlZ2F0ZS5nZXQoKV07CisKKyAgICBFWFBFQ1Rf RkFMU0UoaXNKSVRFbmFibGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29u dHJvbGxlZEJ5Q2FwdGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVk OjpObywgSXNTaG93aW5nSW5pdGlhbEVtcHR5RG9jdW1lbnQ6Olllcyk7CisgICAgcGlkX3QgcGlk MSA9IFt3ZWJWaWV3IF93ZWJQcm9jZXNzSWRlbnRpZmllcl07CisKKyAgICBfX2Jsb2NrIGJvb2wg ZmluaXNoZWROYXZpZ2F0aW9uID0gZmFsc2U7CisgICAgZGVsZWdhdGUuZ2V0KCkuZGlkRmluaXNo TmF2aWdhdGlvbiA9IF4oV0tXZWJWaWV3ICosIFdLTmF2aWdhdGlvbiAqKSB7CisgICAgICAgIGZp bmlzaGVkTmF2aWdhdGlvbiA9IHRydWU7CisgICAgfTsKKworICAgIGRlbGVnYXRlLmdldCgpLmRl Y2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb25XaXRoUHJlZmVyZW5jZXMgPSBeKFdLTmF2aWdh dGlvbkFjdGlvbiAqYWN0aW9uLCBXS1dlYnBhZ2VQcmVmZXJlbmNlcyAqcHJlZmVyZW5jZXMsIHZv aWQgKF5jb21wbGV0aW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5LCBXS1dlYnBh Z2VQcmVmZXJlbmNlcyAqKSkgeworICAgICAgICBFWFBFQ1RfVFJVRShwcmVmZXJlbmNlcy5fY2Fw dGl2ZVBvcnRhbE1vZGVFbmFibGVkKTsKKyAgICAgICAgYm9vbCBkaWRUaHJvd1doZW5UcnlpbmdU b0Rpc2FibGVDYXB0aXZlUG9ydGFsTW9kZSA9IGZhbHNlOworICAgICAgICAvLyBUZXN0V2ViS2l0 QVBJIGRvZXNuJ3QgaGF2ZSB0aGUgd2ViIGJyb3dzZXIgZW50aXRsZW1lbnQgYW5kIHRodXMgc2hv dWxkbid0IGJlIGFibGUgdG8gZGlzYWJsZSBjYXB0aXZlIHBvcnRhbCBtb2RlLgorICAgICAgICBA dHJ5IHsKKyAgICAgICAgICAgIFtwcmVmZXJlbmNlcyBfc2V0Q2FwdGl2ZVBvcnRhbE1vZGVFbmFi bGVkOk5PXTsKKyAgICAgICAgfSBAY2F0Y2ggKE5TRXhjZXB0aW9uICpleGNlcHRpb24pIHsKKyAg ICAgICAgICAgIGRpZFRocm93V2hlblRyeWluZ1RvRGlzYWJsZUNhcHRpdmVQb3J0YWxNb2RlID0g dHJ1ZTsKKyAgICAgICAgfQorICAgICAgICBFWFBFQ1RfVFJVRShkaWRUaHJvd1doZW5UcnlpbmdU b0Rpc2FibGVDYXB0aXZlUG9ydGFsTW9kZSk7CisgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKFdL TmF2aWdhdGlvbkFjdGlvblBvbGljeUFsbG93LCBwcmVmZXJlbmNlcyk7CisgICAgfTsKKworICAg IE5TVVJMICp1cmwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2lt cGxlIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdlYktpdEFQSS5y ZXNvdXJjZXMiXTsKKyAgICBbd2ViVmlldyBsb2FkUmVxdWVzdDpbTlNVUkxSZXF1ZXN0IHJlcXVl c3RXaXRoVVJMOnVybF1dOworICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmZmluaXNoZWRO YXZpZ2F0aW9uKTsKKworICAgIEVYUEVDVF9FUShwaWQxLCBbd2ViVmlldyBfd2ViUHJvY2Vzc0lk ZW50aWZpZXJdKTsgLy8gU2hvdWxkbid0IGhhdmUgcHJvY2Vzcy1zd2FwcGVkIHNpbmNlIHdlJ3Jl IHN0YXlpbmcgaW4gY2FwdGl2ZSBwb3J0YWwgbW9kZS4KKyAgICBFWFBFQ1RfRkFMU0UoaXNKSVRF bmFibGVkKHdlYlZpZXcuZ2V0KCkpKTsKKyAgICBjaGVja1NldHRpbmdzQ29udHJvbGxlZEJ5Q2Fw dGl2ZVBvcnRhbE1vZGUod2ViVmlldy5nZXQoKSwgU2hvdWxkQmVFbmFibGVkOjpObyk7Cit9CisK KyNlbHNlCisKIFRFU1QoUHJvY2Vzc1N3YXAsIENhcHRpdmVQb3J0YWxNb2RlRW5hYmxlZEJ5RGVm YXVsdFRoZW5PcHRPdXQpCiB7CiAgICAgYXV0byB3ZWJWaWV3Q29uZmlndXJhdGlvbiA9IGFkb3B0 TlMoW1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7Cg==