229684 2021-08-30 13:04:14 -0700 WKWebViewConfiguration._loadsSubresources=NO should prevent preconnecting 2021-08-30 15:07:16 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen cdumez ews-watchlist japhet thorton toyoshim webkit-bug-importer yutak oldest_to_newest 1788624 0 achristensen 2021-08-30 13:04:14 -0700 WKWebViewConfiguration._loadsSubresources=NO should prevent preconnecting 1788625 1 436802 achristensen 2021-08-30 13:05:15 -0700 Created attachment 436802 Patch 1788626 2 436802 thorton 2021-08-30 13:08:27 -0700 Comment on attachment 436802 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=436802&action=review > Source/WebKit/WebProcess/Network/WebLoaderStrategy.cpp:778 > + if (auto* corePage = webPage.corePage(); corePage && (!corePage->allowsLoadFromURL(request.url()) || !corePage->loadsSubresources())) { Wonder if we should just tuck this into allowsLoadFromURL (make it take a "is a subresource" param and then it checks both the allowed-hosts list and loadsSubresources)? 1788653 3 436811 achristensen 2021-08-30 14:09:18 -0700 Created attachment 436811 Patch 1788674 4 ews-feeder 2021-08-30 15:06:09 -0700 Committed r281777 (241114@main): <https://commits.webkit.org/241114@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 436811. 1788675 5 webkit-bug-importer 2021-08-30 15:07:16 -0700 <rdar://problem/82549318> 436802 2021-08-30 13:05:15 -0700 2021-08-30 14:09:16 -0700 Patch bug-229684-20210830130514.patch text/plain 4081 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGVmYzU5NDI1ZjkzOTgxYzc0 OGMwY2I5ZTI0MDUxMzZiZTdlMGZlZTAuLmQzNTg3ZmNiMmE5MmIwYjRhZDUwZGQ4YThhNjEzYjky NjlkMmMzZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDgtMzAgIEFsZXggQ2hy aXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXS1dlYlZpZXdD b25maWd1cmF0aW9uLl9sb2Fkc1N1YnJlc291cmNlcz1OTyBzaG91bGQgcHJldmVudCBwcmVjb25u ZWN0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y Mjk2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBU aGlzIGlzIGxpa2UgYnVnIDIyODA0NCBhbmQgZXZlbiB1c2VzIHRoZSBzYW1lIHRlc3Qgc2V0dXAu CisgICAgICAgIFRoaXMgc2hvdWxkIGZpeCByZGFyOi8vNzkzMDcwNzAKKworICAgICAgICAqIFdl YlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5jcHA6CisgICAgICAgIChXZWJLaXQ6 OldlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8pOgorCiAyMDIxLTA4LTI3ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgQWRkIFVJRXZl bnRBdHRyaWJ1dGlvbiBTUEkgdGhhdCB1c2VzIFByaXZhdGVDbGlja01lYXN1cmVtZW50QXR0cmli dXRpb25FcGhlbWVyYWw6OlllcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNz L05ldHdvcmsvV2ViTG9hZGVyU3RyYXRlZ3kuY3BwCmluZGV4IDM0OWVhMmM2MzY5MmFiODA4ZmM3 M2Y1ZDg4NmEyYWE5ZTVjY2YyMmQuLmIzM2EwZmVmNTJmYzU2ZjNhM2RhYTM2ZWJkNjViNzM0OWRm YTEwY2IgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vzcy9OZXR3b3JrL1dlYkxv YWRlclN0cmF0ZWd5LmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9X ZWJMb2FkZXJTdHJhdGVneS5jcHAKQEAgLTc3NSw3ICs3NzUsNyBAQCB2b2lkIFdlYkxvYWRlclN0 cmF0ZWd5OjpwcmVjb25uZWN0VG8oRnJhbWVMb2FkZXImIGZyYW1lTG9hZGVyLCBjb25zdCBVUkwm IHVybCwgUwogCiB2b2lkIFdlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8oV2ViQ29yZTo6 UmVzb3VyY2VSZXF1ZXN0JiYgcmVxdWVzdCwgV2ViUGFnZSYgd2ViUGFnZSwgV2ViRnJhbWUmIHdl YkZyYW1lLCBXZWJDb3JlOjpTdG9yZWRDcmVkZW50aWFsc1BvbGljeSBzdG9yZWRDcmVkZW50aWFs c1BvbGljeSwgUHJlY29ubmVjdENvbXBsZXRpb25IYW5kbGVyJiYgY29tcGxldGlvbkhhbmRsZXIp CiB7Ci0gICAgaWYgKHdlYlBhZ2UuY29yZVBhZ2UoKSAmJiAhd2ViUGFnZS5jb3JlUGFnZSgpLT5h bGxvd3NMb2FkRnJvbVVSTChyZXF1ZXN0LnVybCgpKSkgeworICAgIGlmIChhdXRvKiBjb3JlUGFn ZSA9IHdlYlBhZ2UuY29yZVBhZ2UoKTsgY29yZVBhZ2UgJiYgKCFjb3JlUGFnZS0+YWxsb3dzTG9h ZEZyb21VUkwocmVxdWVzdC51cmwoKSkgfHwgIWNvcmVQYWdlLT5sb2Fkc1N1YnJlc291cmNlcygp KSkgewogICAgICAgICBpZiAoY29tcGxldGlvbkhhbmRsZXIpCiAgICAgICAgICAgICBjb21wbGV0 aW9uSGFuZGxlcih7IH0pOwogICAgICAgICByZXR1cm47CmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOGRkMWJkOGJkZmE2MTMxYWMyNjUzYjhkZTMw OWIxYTAxZjRiZTY3MC4uOWY4ZTc1MTVhNGZkZjQwYmJmNGNlOWEyMTdkNjNmYzA0N2ExM2QwNiAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIxLTA4LTMwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5fbG9hZHNTdWJyZXNv dXJjZXM9Tk8gc2hvdWxkIHByZXZlbnQgcHJlY29ubmVjdGluZworICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5Njg0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktp dENvY29hL1ByZWNvbm5lY3QubW06CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjp2ZXJpZnlQcmVj b25uZWN0RGlzYWJsZWQpOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjEt MDgtMjcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAg ICAgICBBZGQgVUlFdmVudEF0dHJpYnV0aW9uIFNQSSB0aGF0IHVzZXMgUHJpdmF0ZUNsaWNrTWVh c3VyZW1lbnRBdHRyaWJ1dGlvbkVwaGVtZXJhbDo6WWVzCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0gYi9Ub29scy9UZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0KaW5kZXggNDc2MjFmMjBiZGM3 MjgyNzJiYzhiNDYyYTNlZDhlYmFkMjE0MTUxMi4uOWIxZWJmYWQ3MWZkZjBlZDhmMTg0MjRlZDJi NDBiOGE4NGJiZjQ2YyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJL aXRDb2NvYS9QcmVjb25uZWN0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvUHJlY29ubmVjdC5tbQpAQCAtMjMyLDcgKzIzMiw3IEBAIFRFU1QoUHJlY29ubmVj dCwgSDJQaW5nRnJvbVdlYkNvcmVOU1VSTFNlc3Npb24pCiAKICNlbmRpZiAvLyBIQVZFKFBSRUNP Tk5FQ1RfUElORykKIAotVEVTVChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKK3N0YXRp YyB2b2lkIHZlcmlmeVByZWNvbm5lY3REaXNhYmxlZCh2b2lkKCpkaXNhYmxlcikoV0tXZWJWaWV3 Q29uZmlndXJhdGlvbiAqKSkKIHsKICAgICBzaXplX3QgY29ubmVjdGlvbkNvdW50IHsgMCB9Owog ICAgIEhUVFBTZXJ2ZXIgc2VydmVyKFsmXShDb25uZWN0aW9uKSB7CkBAIC0yNDIsNyArMjQyLDcg QEAgVEVTVChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKIAogICAgIHsKICAgICAgICAg YXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBuZXdd KTsKLSAgICAgICAgY29uZmlndXJhdGlvbi5nZXQoKS5fYWxsb3dlZE5ldHdvcmtIb3N0cyA9IFtO U1NldCBzZXRdOworICAgICAgICBkaXNhYmxlcihjb25maWd1cmF0aW9uLmdldCgpKTsKICAgICAg ICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFt ZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAgICAg ICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6bmlsXTsKICAgICAgICAgW3dl YlZpZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwpAQCAtMjYxLDQgKzI2MSwx NCBAQCBURVNUKFByZWNvbm5lY3QsIERpc2FibGVQcmVjb25uZWN0KQogICAgIH0KIH0KIAorVEVT VChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKK3sKKyAgICB2ZXJpZnlQcmVjb25uZWN0 RGlzYWJsZWQoW10gKFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24pIHsKKyAg ICAgICAgY29uZmlndXJhdGlvbi5fYWxsb3dlZE5ldHdvcmtIb3N0cyA9IFtOU1NldCBzZXRdOwor ICAgIH0pOworICAgIHZlcmlmeVByZWNvbm5lY3REaXNhYmxlZChbXSAoV0tXZWJWaWV3Q29uZmln dXJhdGlvbiAqY29uZmlndXJhdGlvbikgeworICAgICAgICBjb25maWd1cmF0aW9uLl9sb2Fkc1N1 YnJlc291cmNlcyA9IE5POworICAgIH0pOworfQorCiB9Cg== 436811 2021-08-30 14:09:18 -0700 2021-08-30 15:06:10 -0700 Patch bug-229684-20210830140917.patch text/plain 10431 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgxNzIzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODUyYzAyZjMwM2ExNWY3 ODI0MDc0Njc5OWIyN2U1MTU0NWYyNjJkOS4uYjViM2JlY2M3ZDE4NjAyNGY2MDQyM2Y3MGQ0ODcy NTEyZDhiYjA5NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDIxLTA4LTMwICBBbGV4 IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJW aWV3Q29uZmlndXJhdGlvbi5fbG9hZHNTdWJyZXNvdXJjZXM9Tk8gc2hvdWxkIHByZXZlbnQgcHJl Y29ubmVjdGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MjI5Njg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGltIEhvcnRvbi4KKworICAgICAgICAq IE1vZHVsZXMvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbC5jcHA6CisgICAg ICAgIChXZWJDb3JlOjpUaHJlYWRhYmxlV2ViU29ja2V0Q2hhbm5lbDo6dmFsaWRhdGVVUkwpOgor ICAgICAgICAqIGxvYWRlci9SZXNvdXJjZUxvYWROb3RpZmllci5jcHA6CisgICAgICAgIChXZWJD b3JlOjpSZXNvdXJjZUxvYWROb3RpZmllcjo6ZGlzcGF0Y2hXaWxsU2VuZFJlcXVlc3QpOgorICAg ICAgICAqIHBhZ2UvUGFnZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQYWdlOjphbGxvd3NMb2Fk RnJvbVVSTCBjb25zdCk6CisgICAgICAgICogcGFnZS9QYWdlLmg6CisgICAgICAgIChXZWJDb3Jl OjpQYWdlOjpsb2Fkc1N1YnJlc291cmNlcyBjb25zdCk6IERlbGV0ZWQuCisKIDIwMjEtMDgtMjcg IEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAogICAgICAgICBT ZXBhcmF0ZSBQcml2YXRlQ2xpY2tNZWFzdXJlbWVudCBkYXRhYmFzZSBmcm9tIFJlc291cmNlTG9h ZFN0YXRpc3RpY3MgZGF0YWJhc2UgYW5kIGFkZCBTUEkgdG8gc2V0IGl0cyBsb2NhdGlvbgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxv ZwppbmRleCBlZmM1OTQyNWY5Mzk4MWM3NDhjMGNiOWUyNDA1MTM2YmU3ZTBmZWUwLi40MzRjOWQ5 MTI0NjYzNGIzM2RmYjNlMjRlYzk2M2FlZDdjNjZhYjA1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi S2l0L0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2 IEBACisyMDIxLTA4LTMwICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgV0tXZWJWaWV3Q29uZmlndXJhdGlvbi5fbG9hZHNTdWJyZXNvdXJjZXM9 Tk8gc2hvdWxkIHByZXZlbnQgcHJlY29ubmVjdGluZworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5Njg0CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgVGlt IEhvcnRvbi4KKworICAgICAgICBUaGlzIGlzIGxpa2UgYnVnIDIyODA0NCBhbmQgZXZlbiB1c2Vz IHRoZSBzYW1lIHRlc3Qgc2V0dXAuCisgICAgICAgIFRoaXMgc2hvdWxkIGZpeCByZGFyOi8vNzkz MDcwNzAKKworICAgICAgICAqIFdlYlByb2Nlc3MvTmV0d29yay9XZWJMb2FkZXJTdHJhdGVneS5j cHA6CisgICAgICAgIChXZWJLaXQ6OldlYkxvYWRlclN0cmF0ZWd5OjpwcmVjb25uZWN0VG8pOgor CiAyMDIxLTA4LTI3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+ CiAKICAgICAgICAgQWRkIFVJRXZlbnRBdHRyaWJ1dGlvbiBTUEkgdGhhdCB1c2VzIFByaXZhdGVD bGlja01lYXN1cmVtZW50QXR0cmlidXRpb25FcGhlbWVyYWw6OlllcwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRDaGFubmVs LmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2Vic29ja2V0cy9UaHJlYWRhYmxlV2ViU29j a2V0Q2hhbm5lbC5jcHAKaW5kZXggYjUwYWEwMzEyOTY5NTk2MGY0YjU0NWYyYjg4NGVhZTc3NGM1 Mjk1Ni4uM2JkMmMxMGU3ZmIwY2Y5NDA1YzQ0ZmYyOWY1MjkwNjc2MzFiOWI0ZCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJzb2NrZXRzL1RocmVhZGFibGVXZWJTb2NrZXRD aGFubmVsLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYnNvY2tldHMvVGhyZWFk YWJsZVdlYlNvY2tldENoYW5uZWwuY3BwCkBAIC05MCw3ICs5MCw3IEBAIHN0ZDo6b3B0aW9uYWw8 VGhyZWFkYWJsZVdlYlNvY2tldENoYW5uZWw6OlZhbGlkYXRlZFVSTD4gVGhyZWFkYWJsZVdlYlNv Y2tldENoYW5uCiB7CiAgICAgVmFsaWRhdGVkVVJMIHZhbGlkYXRlZFVSTCB7IHJlcXVlc3RlZFVS TCwgdHJ1ZSB9OwogICAgIGlmIChhdXRvKiBwYWdlID0gZG9jdW1lbnQucGFnZSgpKSB7Ci0gICAg ICAgIGlmICghcGFnZS0+YWxsb3dzTG9hZEZyb21VUkwocmVxdWVzdGVkVVJMKSkKKyAgICAgICAg aWYgKCFwYWdlLT5hbGxvd3NMb2FkRnJvbVVSTChyZXF1ZXN0ZWRVUkwsIE1haW5GcmFtZU1haW5S ZXNvdXJjZTo6Tm8pKQogICAgICAgICAgICAgcmV0dXJuIHsgfTsKICNpZiBFTkFCTEUoQ09OVEVO VF9FWFRFTlNJT05TKQogICAgICAgICBpZiAoYXV0byogZG9jdW1lbnRMb2FkZXIgPSBkb2N1bWVu dC5sb2FkZXIoKSkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNl TG9hZE5vdGlmaWVyLmNwcCBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWROb3Rp Zmllci5jcHAKaW5kZXggMTRhOTkyMmJiZjlhNTU1Nzc3NjJlODExMzdkMzU5Nzk0MDc4N2FmZC4u OWI3NmMwNTkwMmYzYzlmMjY0YzAwNzQyOGUzNmI5OGJlZjc0OTMyZSAxMDA2NDQKLS0tIGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE5vdGlmaWVyLmNwcAorKysgYi9Tb3VyY2Uv V2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkTm90aWZpZXIuY3BwCkBAIC0xMzgsMTAgKzEzOCw4 IEBAIHZvaWQgUmVzb3VyY2VMb2FkTm90aWZpZXI6OmRpc3BhdGNoV2lsbFNlbmRSZXF1ZXN0KERv Y3VtZW50TG9hZGVyKiBsb2FkZXIsIHVuc2lnCiAgICAgbV9mcmFtZS5sb2FkZXIoKS5jbGllbnQo KS5kaXNwYXRjaFdpbGxTZW5kUmVxdWVzdChsb2FkZXIsIGlkZW50aWZpZXIsIHJlcXVlc3QsIHJl ZGlyZWN0UmVzcG9uc2UpOwogCiAgICAgaWYgKGF1dG8qIHBhZ2UgPSBtX2ZyYW1lLnBhZ2UoKSkg ewotICAgICAgICBpZiAoIXBhZ2UtPmxvYWRzU3VicmVzb3VyY2VzKCkpIHsKLSAgICAgICAgICAg IGlmICghbV9mcmFtZS5pc01haW5GcmFtZSgpIHx8IChtX2luaXRpYWxSZXF1ZXN0SWRlbnRpZmll ciAmJiAqbV9pbml0aWFsUmVxdWVzdElkZW50aWZpZXIgIT0gaWRlbnRpZmllcikpCi0gICAgICAg ICAgICAgICAgcmVxdWVzdCA9IHsgfTsKLSAgICAgICAgfSBlbHNlIGlmICghcGFnZS0+YWxsb3dz TG9hZEZyb21VUkwocmVxdWVzdC51cmwoKSkpCisgICAgICAgIGF1dG8gbWFpbkZyYW1lTWFpblJl c291cmNlID0gbV9mcmFtZS5pc01haW5GcmFtZSgpICYmIG1faW5pdGlhbFJlcXVlc3RJZGVudGlm aWVyID09IGlkZW50aWZpZXIgPyBNYWluRnJhbWVNYWluUmVzb3VyY2U6OlllcyA6IE1haW5GcmFt ZU1haW5SZXNvdXJjZTo6Tm87CisgICAgICAgIGlmICghcGFnZS0+YWxsb3dzTG9hZEZyb21VUkwo cmVxdWVzdC51cmwoKSwgbWFpbkZyYW1lTWFpblJlc291cmNlKSkKICAgICAgICAgICAgIHJlcXVl c3QgPSB7IH07CiAgICAgfQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2Uu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGFnZS9QYWdlLmNwcAppbmRleCBlZWU2OGI3N2UxZTVmY2Ux ZTU5YzMyOTQzNGE5YTg2MDBiMzY5NzEwLi43MDkxNGI1MTM2ODJjOTA3YmM5N2I4ZmRhNDYyZDJi MTM3YzZjYzVlIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wYWdlL1BhZ2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5jcHAKQEAgLTMzNTksOCArMzM1OSwxMCBAQCB2b2lk IFBhZ2U6OmZvckVhY2hNZWRpYUVsZW1lbnQoY29uc3QgRnVuY3Rpb248dm9pZChIVE1MTWVkaWFF bGVtZW50Jik+JiBmdW5jdG9yKQogI2VuZGlmCiB9CiAKLWJvb2wgUGFnZTo6YWxsb3dzTG9hZEZy b21VUkwoY29uc3QgVVJMJiB1cmwpIGNvbnN0Citib29sIFBhZ2U6OmFsbG93c0xvYWRGcm9tVVJM KGNvbnN0IFVSTCYgdXJsLCBNYWluRnJhbWVNYWluUmVzb3VyY2UgbWFpbkZyYW1lTWFpblJlc291 cmNlKSBjb25zdAogeworICAgIGlmIChtYWluRnJhbWVNYWluUmVzb3VyY2UgPT0gTWFpbkZyYW1l TWFpblJlc291cmNlOjpObyAmJiAhbV9sb2Fkc1N1YnJlc291cmNlcykKKyAgICAgICAgcmV0dXJu IGZhbHNlOwogICAgIGlmICghbV9hbGxvd2VkTmV0d29ya0hvc3RzKQogICAgICAgICByZXR1cm4g dHJ1ZTsKICAgICBpZiAoIXVybC5wcm90b2NvbElzSW5IVFRQRmFtaWx5KCkgJiYgIXVybC5wcm90 b2NvbElzKCJ3cyIpICYmICF1cmwucHJvdG9jb2xJcygid3NzIikpCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViQ29yZS9wYWdlL1BhZ2UuaCBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCmluZGV4 IDkyNTViZjMxM2M2N2Q3MTQ4MTVjZjc4MTUyNjZmZmQ4MDViMjJmNjAuLmI4NTc3NTQ4NTUyYmJk N2M3YzE2NGRlZGE4NDM1NjhkYjRlMjQ5MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3Bh Z2UvUGFnZS5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BhZ2UvUGFnZS5oCkBAIC0xNzMsNiArMTcz LDcgQEAgZW51bSBjbGFzcyBSb3V0ZVNoYXJpbmdQb2xpY3kgOiB1aW50OF90OwogZW51bSBjbGFz cyBTaG91bGRUcmVhdEFzQ29udGludWluZ0xvYWQgOiB1aW50OF90OwogCiBlbnVtIGNsYXNzIEV2 ZW50VGhyb3R0bGluZ0JlaGF2aW9yIDogYm9vbCB7IFJlc3BvbnNpdmUsIFVucmVzcG9uc2l2ZSB9 OworZW51bSBjbGFzcyBNYWluRnJhbWVNYWluUmVzb3VyY2UgOiBib29sIHsgTm8sIFllcyB9Owog CiBlbnVtIGNsYXNzIENvbXBvc2l0aW5nUG9saWN5IDogYm9vbCB7CiAgICAgTm9ybWFsLApAQCAt ODE0LDggKzgxNSw3IEBAIHB1YmxpYzoKICAgICBib29sIGlzT25seU5vblV0aWxpdHlQYWdlKCkg Y29uc3Q7CiAgICAgYm9vbCBpc1V0aWxpdHlQYWdlKCkgY29uc3QgeyByZXR1cm4gbV9pc1V0aWxp dHlQYWdlOyB9CiAKLSAgICBib29sIGxvYWRzU3VicmVzb3VyY2VzKCkgY29uc3QgeyByZXR1cm4g bV9sb2Fkc1N1YnJlc291cmNlczsgfQotICAgIFdFQkNPUkVfRVhQT1JUIGJvb2wgYWxsb3dzTG9h ZEZyb21VUkwoY29uc3QgVVJMJikgY29uc3Q7CisgICAgV0VCQ09SRV9FWFBPUlQgYm9vbCBhbGxv d3NMb2FkRnJvbVVSTChjb25zdCBVUkwmLCBNYWluRnJhbWVNYWluUmVzb3VyY2UpIGNvbnN0Owog ICAgIFNob3VsZFJlbGF4VGhpcmRQYXJ0eUNvb2tpZUJsb2NraW5nIHNob3VsZFJlbGF4VGhpcmRQ YXJ0eUNvb2tpZUJsb2NraW5nKCkgY29uc3QgeyByZXR1cm4gbV9zaG91bGRSZWxheFRoaXJkUGFy dHlDb29raWVCbG9ja2luZzsgfQogCiAgICAgYm9vbCBpc0xvd1Bvd2VyTW9kZUVuYWJsZWQoKSBj b25zdCB7IHJldHVybiBtX3Rocm90dGxpbmdSZWFzb25zLmNvbnRhaW5zKFRocm90dGxpbmdSZWFz b246Okxvd1Bvd2VyTW9kZSk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcCBiL1NvdXJjZS9XZWJLaXQvV2ViUHJvY2Vz cy9OZXR3b3JrL1dlYkxvYWRlclN0cmF0ZWd5LmNwcAppbmRleCAzNDllYTJjNjM2OTJhYjgwOGZj NzNmNWQ4ODZhMmFhOWU1Y2NmMjJkLi41ZGZkYmVmZWVhMmU2NGNlYjI0MGY2NTc0N2Q4ZWM0NTlk MDVmZjY0IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1dlYlByb2Nlc3MvTmV0d29yay9XZWJM b2FkZXJTdHJhdGVneS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9XZWJQcm9jZXNzL05ldHdvcmsv V2ViTG9hZGVyU3RyYXRlZ3kuY3BwCkBAIC03NzUsNyArNzc1LDcgQEAgdm9pZCBXZWJMb2FkZXJT dHJhdGVneTo6cHJlY29ubmVjdFRvKEZyYW1lTG9hZGVyJiBmcmFtZUxvYWRlciwgY29uc3QgVVJM JiB1cmwsIFMKIAogdm9pZCBXZWJMb2FkZXJTdHJhdGVneTo6cHJlY29ubmVjdFRvKFdlYkNvcmU6 OlJlc291cmNlUmVxdWVzdCYmIHJlcXVlc3QsIFdlYlBhZ2UmIHdlYlBhZ2UsIFdlYkZyYW1lJiB3 ZWJGcmFtZSwgV2ViQ29yZTo6U3RvcmVkQ3JlZGVudGlhbHNQb2xpY3kgc3RvcmVkQ3JlZGVudGlh bHNQb2xpY3ksIFByZWNvbm5lY3RDb21wbGV0aW9uSGFuZGxlciYmIGNvbXBsZXRpb25IYW5kbGVy KQogewotICAgIGlmICh3ZWJQYWdlLmNvcmVQYWdlKCkgJiYgIXdlYlBhZ2UuY29yZVBhZ2UoKS0+ YWxsb3dzTG9hZEZyb21VUkwocmVxdWVzdC51cmwoKSkpIHsKKyAgICBpZiAod2ViUGFnZS5jb3Jl UGFnZSgpICYmICF3ZWJQYWdlLmNvcmVQYWdlKCktPmFsbG93c0xvYWRGcm9tVVJMKHJlcXVlc3Qu dXJsKCksIE1haW5GcmFtZU1haW5SZXNvdXJjZTo6Tm8pKSB7CiAgICAgICAgIGlmIChjb21wbGV0 aW9uSGFuZGxlcikKICAgICAgICAgICAgIGNvbXBsZXRpb25IYW5kbGVyKHsgfSk7CiAgICAgICAg IHJldHVybjsKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCA4ZGQxYmQ4YmRmYTYxMzFhYzI2NTNiOGRlMzA5YjFhMDFmNGJlNjcwLi4wY2M2MGIwZWYy ZmM3NWVmY2E4MzFkYzUxYzk3NDUxMTZhNDBhM2RlIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMDgtMzAgIEFs ZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBXS1dl YlZpZXdDb25maWd1cmF0aW9uLl9sb2Fkc1N1YnJlc291cmNlcz1OTyBzaG91bGQgcHJldmVudCBw cmVjb25uZWN0aW5nCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD0yMjk2ODQKKworICAgICAgICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uLgorCisgICAgICAg ICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9QcmVjb25uZWN0Lm1tOgorICAgICAg ICAoVGVzdFdlYktpdEFQSTo6dmVyaWZ5UHJlY29ubmVjdERpc2FibGVkKToKKyAgICAgICAgKFRl c3RXZWJLaXRBUEk6OlRFU1QpOgorICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0 Q29jb2EvV2ViU29ja2V0Lm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIw MjEtMDgtMjcgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KIAog ICAgICAgICBBZGQgVUlFdmVudEF0dHJpYnV0aW9uIFNQSSB0aGF0IHVzZXMgUHJpdmF0ZUNsaWNr TWVhc3VyZW1lbnRBdHRyaWJ1dGlvbkVwaGVtZXJhbDo6WWVzCmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0gYi9Ub29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1ByZWNvbm5lY3QubW0KaW5kZXggNDc2MjFmMjBi ZGM3MjgyNzJiYzhiNDYyYTNlZDhlYmFkMjE0MTUxMi4uOWIxZWJmYWQ3MWZkZjBlZDhmMTg0MjRl ZDJiNDBiOGE4NGJiZjQ2YyAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9QcmVjb25uZWN0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Q29jb2EvUHJlY29ubmVjdC5tbQpAQCAtMjMyLDcgKzIzMiw3IEBAIFRFU1QoUHJlY29u bmVjdCwgSDJQaW5nRnJvbVdlYkNvcmVOU1VSTFNlc3Npb24pCiAKICNlbmRpZiAvLyBIQVZFKFBS RUNPTk5FQ1RfUElORykKIAotVEVTVChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKK3N0 YXRpYyB2b2lkIHZlcmlmeVByZWNvbm5lY3REaXNhYmxlZCh2b2lkKCpkaXNhYmxlcikoV0tXZWJW aWV3Q29uZmlndXJhdGlvbiAqKSkKIHsKICAgICBzaXplX3QgY29ubmVjdGlvbkNvdW50IHsgMCB9 OwogICAgIEhUVFBTZXJ2ZXIgc2VydmVyKFsmXShDb25uZWN0aW9uKSB7CkBAIC0yNDIsNyArMjQy LDcgQEAgVEVTVChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKIAogICAgIHsKICAgICAg ICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBu ZXddKTsKLSAgICAgICAgY29uZmlndXJhdGlvbi5nZXQoKS5fYWxsb3dlZE5ldHdvcmtIb3N0cyA9 IFtOU1NldCBzZXRdOworICAgICAgICBkaXNhYmxlcihjb25maWd1cmF0aW9uLmdldCgpKTsKICAg ICAgICAgYXV0byB3ZWJWaWV3ID0gYWRvcHROUyhbW1dLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhG cmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbi5nZXQoKV0pOwogICAg ICAgICBbd2ViVmlldyBsb2FkSFRNTFN0cmluZzpodG1sIGJhc2VVUkw6bmlsXTsKICAgICAgICAg W3dlYlZpZXcgX3Rlc3Rfd2FpdEZvckRpZEZpbmlzaE5hdmlnYXRpb25dOwpAQCAtMjYxLDQgKzI2 MSwxNCBAQCBURVNUKFByZWNvbm5lY3QsIERpc2FibGVQcmVjb25uZWN0KQogICAgIH0KIH0KIAor VEVTVChQcmVjb25uZWN0LCBEaXNhYmxlUHJlY29ubmVjdCkKK3sKKyAgICB2ZXJpZnlQcmVjb25u ZWN0RGlzYWJsZWQoW10gKFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNvbmZpZ3VyYXRpb24pIHsK KyAgICAgICAgY29uZmlndXJhdGlvbi5fYWxsb3dlZE5ldHdvcmtIb3N0cyA9IFtOU1NldCBzZXRd OworICAgIH0pOworICAgIHZlcmlmeVByZWNvbm5lY3REaXNhYmxlZChbXSAoV0tXZWJWaWV3Q29u ZmlndXJhdGlvbiAqY29uZmlndXJhdGlvbikgeworICAgICAgICBjb25maWd1cmF0aW9uLl9sb2Fk c1N1YnJlc291cmNlcyA9IE5POworICAgIH0pOworfQorCiB9CmRpZmYgLS1naXQgYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1dlYlNvY2tldC5tbSBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvV2ViU29ja2V0Lm1tCmluZGV4IDYyMTYzZWFlMTEy NmRiNDU0MDJiM2RkOWQzYThiODBkNjFhODAzOWIuLmY1MWY2MmQyZGFkY2Y3Nzk3ZmMyMmZjODk5 YTRjM2EyNGYxOTk5OGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV2ViU29ja2V0Lm1tCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvV2ViU29ja2V0Lm1tCkBAIC0yMTIsNCArMjEyLDI5IEBAIFRFU1QoV2ViU29ja2V0 LCBDbG9zZUNvZGUpCiB9CiAjZW5kaWYgLy8gSEFWRShOU1VSTFNFU1NJT05fV0VCU09DS0VUKQog CitURVNUKFdlYlNvY2tldCwgQmxvY2tlZFdpdGhTdWJyZXNvdXJjZXMpCit7CisgICAgSFRUUFNl cnZlciBzZXJ2ZXIoW10oQ29ubmVjdGlvbiBjb25uZWN0aW9uKSB7CisgICAgICAgIGNvbm5lY3Rp b24ud2ViU29ja2V0SGFuZHNoYWtlKCk7CisgICAgfSk7CisKKyAgICBOU1N0cmluZyAqaHRtbCA9 IFtOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAiIgorICAgICI8c2NyaXB0PiIKKyAgICAiICAg IHZhciB3cyA9IG5ldyBXZWJTb2NrZXQoJ3dzOi8vMTI3LjAuMC4xOiVkLycpOyIKKyAgICAiICAg IHdzLm9ub3BlbiA9IGZ1bmN0aW9uKCkgeyBhbGVydCgnb3BlbmVkIHN1Y2Nlc3NmdWxseScpOyB9 OyIKKyAgICAiICAgIHdzLm9uZXJyb3IgPSBmdW5jdGlvbihlcnJvcikgeyBhbGVydCgnRkFJTCAt IGVycm9yICcgKyBlcnJvci5tZXNzYWdlKTsgfSIKKyAgICAiPC9zY3JpcHQ+Iiwgc2VydmVyLnBv cnQoKV07CisKKyAgICB7CisgICAgICAgIGF1dG8gY29uZmlndXJhdGlvbiA9IGFkb3B0TlMoW1dL V2ViVmlld0NvbmZpZ3VyYXRpb24gbmV3XSk7CisgICAgICAgIGNvbmZpZ3VyYXRpb24uZ2V0KCku X2xvYWRzU3VicmVzb3VyY2VzID0gTk87CisgICAgICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMo W1tXS1dlYlZpZXcgYWxsb2NdIGluaXRXaXRoRnJhbWU6Q0dSZWN0WmVybyBjb25maWd1cmF0aW9u OmNvbmZpZ3VyYXRpb24uZ2V0KCldKTsKKyAgICAgICAgW3dlYlZpZXcgbG9hZEhUTUxTdHJpbmc6 aHRtbCBiYXNlVVJMOm5pbF07CisgICAgICAgIEVYUEVDVF9XS19TVFJFUShbd2ViVmlldyBfdGVz dF93YWl0Rm9yQWxlcnRdLCAiRkFJTCAtIGVycm9yIHVuZGVmaW5lZCIpOworICAgIH0KKyAgICBh dXRvIHdlYlZpZXcgPSBhZG9wdE5TKFtXS1dlYlZpZXcgbmV3XSk7CisgICAgW3dlYlZpZXcgbG9h ZEhUTUxTdHJpbmc6aHRtbCBiYXNlVVJMOm5pbF07CisgICAgRVhQRUNUX1dLX1NUUkVRKFt3ZWJW aWV3IF90ZXN0X3dhaXRGb3JBbGVydF0sICJvcGVuZWQgc3VjY2Vzc2Z1bGx5Iik7Cit9CisKIH0K