231109 2021-10-01 16:19:25 -0700 Implement HTTPS proxy in HTTPServer 2021-10-01 17:23:58 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 achristensen achristensen ggaren webkit-bug-importer oldest_to_newest 1799609 0 achristensen 2021-10-01 16:19:25 -0700 Implement HTTPS proxy in HTTPServer 1799610 1 439927 achristensen 2021-10-01 16:20:57 -0700 Created attachment 439927 Patch 1799612 2 439927 ggaren 2021-10-01 16:23:26 -0700 Comment on attachment 439927 Patch r=me 1799637 3 439933 achristensen 2021-10-01 16:55:00 -0700 Created attachment 439933 Patch 1799654 4 ews-feeder 2021-10-01 17:22:34 -0700 Committed r283427 (242414@main): <https://commits.webkit.org/242414@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 439933. 1799656 5 webkit-bug-importer 2021-10-01 17:23:58 -0700 <rdar://problem/83789023> 439927 2021-10-01 16:20:57 -0700 2021-10-01 17:00:20 -0700 Patch bug-231109-20211001162056.patch text/plain 7623 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWZiMzY5NzQ4OTBhM2IxNjEwNDhjNzY4MzczMzc4OTQ4 YjY2NmI1My4uZGFlMGE5NGI5MjEzOTM1M2Y3YjE3NmEwZGZhYTkwMTQ0MjMyOGRhNyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIxLTEwLTAxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgSW1wbGVtZW50IEhUVFBTIHByb3h5IGluIEhUVFBTZXJ2ZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFByZXZpb3VzbHkgd2Ug dXNlZCBUQ1BTZXJ2ZXIgZm9yIHRoaXMsIHdoaWNoIGlzIHBpY2t5IGFib3V0IHRoZSBleGFjdCBu dW1iZXIgb2YgY29ubmVjdGlvbnMsIHJlcXVlc3RzLCBhbmQgcmVwbGllcy4KKyAgICAgICAgSWYg ZXZlcnl0aGluZyBpc24ndCBwZXJmZWN0LCBpdCBoYW5ncyBpbiB0aGUgVENQU2VydmVyIGRlc3Ry dWN0b3IuCisgICAgICAgIEl0IGFsc28gZG9lc24ndCBydW4gdGhlIHNlcnZlciBsb2dpYyBvbiB0 aGUgbWFpbiB0aHJlYWQuCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyBtaWdyYXRpb24gdG8gSFRU UFNlcnZlciwgdGhlIHJlcGxhY2VtZW50IGZvciBUQ1BTZXJ2ZXIuCisKKyAgICAgICAgKiBUZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tOgorICAgICAgICAoVGVzdFdlYktp dEFQSTo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLmg6 CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tOgorICAgICAgICAo VGVzdFdlYktpdEFQSTo6cHJveHlEZWZpbml0aW9uKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6 OkhUVFBTZXJ2ZXI6Omxpc3RlbmVyUGFyYW1ldGVycyk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJ OjpIVFRQU2VydmVyOjpyZXNwb25kV2l0aE9LKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkhU VFBTZXJ2ZXI6OnJlcXVlc3QgY29uc3QpOgorCiAyMDIxLTEwLTAxICBKb25hdGhhbiBCZWRhcmQg IDxqYmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgVGFza1Bv b2wgKEZvbGxvdy11cCBmaXgpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3Rz L1dlYktpdENvY29hL1Byb3h5Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRD b2NvYS9Qcm94eS5tbQppbmRleCBiZjE1NDBlOGUyODlkMzE3NGYxMmI1ZTIwYjMyZjBlMGUxNjFk N2E4Li4yOGU2NDgzZTZiMmE3MjA0NDI4NGY3NDU3NjNlMzhiNzkxMjMyODM1IDEwMDY0NAotLS0g YS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tCisrKyBiL1Rv b2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJveHkubW0KQEAgLTc4LDcgKzc4 LDcgQEAgbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewogCiBURVNUKFdlYktpdCwgSFRUUFNQcm94 eSkKIHsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6UHJvdG9jb2w6OkhUVFBTUHJv eHksIFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhPSyk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoSFRU UFNlcnZlcjo6cmVzcG9uZFdpdGhPSywgSFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzUHJveHkp OwogCiAgICAgYXV0byBzdG9yZUNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtfV0tXZWJzaXRlRGF0 YVN0b3JlQ29uZmlndXJhdGlvbiBuZXddKTsKICAgICBbc3RvcmVDb25maWd1cmF0aW9uIHNldEhU VFBTUHJveHk6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6 QCJodHRwczovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dOwpkaWZmIC0tZ2l0IGEv VG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLmggYi9Ub29scy9UZXN0V2ViS2l0 QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaAppbmRleCBjNTY2MTZiOGZkNDg1OTkyZjIzNDdmYThlN2Fj ZDc0OGY1YjQyYTFhLi4wN2I3YTJhNTBjNjZhYTM4Yjg4NjI2NjhmMzMzYjE4NmViMGQyM2QwIDEw MDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaAorKysgYi9U b29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaApAQCAtNDEsNyArNDEsNyBAQCBj bGFzcyBIVFRQU2VydmVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoK ICAgICBzdHJ1Y3QgUmVxdWVzdERhdGE7Ci0gICAgZW51bSBjbGFzcyBQcm90b2NvbCA6IHVpbnQ4 X3QgeyBIdHRwLCBIdHRwcywgSHR0cHNXaXRoTGVnYWN5VExTLCBIdHRwMiB9OworICAgIGVudW0g Y2xhc3MgUHJvdG9jb2wgOiB1aW50OF90IHsgSHR0cCwgSHR0cHMsIEh0dHBzV2l0aExlZ2FjeVRM UywgSHR0cDIsIEh0dHBzUHJveHkgfTsKICAgICB1c2luZyBDZXJ0aWZpY2F0ZVZlcmlmaWVyID0g RnVuY3Rpb248dm9pZChzZWNfcHJvdG9jb2xfbWV0YWRhdGFfdCwgc2VjX3RydXN0X3QsIHNlY19w cm90b2NvbF92ZXJpZnlfY29tcGxldGVfdCk+OwogCiAgICAgSFRUUFNlcnZlcihzdGQ6OmluaXRp YWxpemVyX2xpc3Q8c3RkOjpwYWlyPFN0cmluZywgSFRUUFJlc3BvbnNlPj4sIFByb3RvY29sID0g UHJvdG9jb2w6Okh0dHAsIENlcnRpZmljYXRlVmVyaWZpZXImJiA9IG51bGxwdHIsIFJldGFpblB0 cjxTZWNJZGVudGl0eVJlZj4mJiA9IG51bGxwdHIsIHN0ZDo6b3B0aW9uYWw8dWludDE2X3Q+IHBv cnQgPSB7IH0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2Vy dmVyLm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCmluZGV4IGQ3 MjBiYTY0ZGI0MzA2OWJmNzM1YjMwNWJkZTMwZjQ0ZTc3ZTkyMGUuLjg3YTUxYTRiMzMxYWEyZDlk N2NjMzk2YjY0ZmEyY2M0ZjA1YzNjMTUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkv Y29jb2EvSFRUUFNlcnZlci5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBT ZXJ2ZXIubW0KQEAgLTUyLDExICs1MiwzNCBAQCBzdHJ1Y3QgSFRUUFNlcnZlcjo6UmVxdWVzdERh dGEgOiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8UmVxdWVzdERhdGEsIFdURjo6RAogICAg IFZlY3RvcjxDb25uZWN0aW9uPiBjb25uZWN0aW9uczsKIH07CiAKK3N0YXRpYyBSZXRhaW5QdHI8 bndfcHJvdG9jb2xfZGVmaW5pdGlvbl90PiBwcm94eURlZmluaXRpb24oKQoreworICAgIHJldHVy biBhZG9wdE5TKG53X2ZyYW1lcl9jcmVhdGVfZGVmaW5pdGlvbigiSHR0cHNQcm94eSIsIE5XX0ZS QU1FUl9DUkVBVEVfRkxBR1NfREVGQVVMVCwgW10gKG53X2ZyYW1lcl90IGZyYW1lcikgLT4gbndf ZnJhbWVyX3N0YXJ0X3Jlc3VsdF90IHsKKyAgICAgICAgbndfZnJhbWVyX3NldF9pbnB1dF9oYW5k bGVyKGZyYW1lciwgW10gKG53X2ZyYW1lcl90IGZyYW1lcikgLT4gc2l6ZV90IHsKKyAgICAgICAg ICAgIG53X2ZyYW1lcl9wYXJzZV9pbnB1dChmcmFtZXIsIDEsIHN0ZDo6bnVtZXJpY19saW1pdHM8 dWludDMyX3Q+OjptYXgoKSwgbnVsbHB0ciwgW3JldGFpbmVkRnJhbWVyID0gcmV0YWluUHRyKGZy YW1lcildKHVpbnQ4X3QqLCBzaXplX3QgYnVmZmVyTGVuZ3RoLCBib29sKSBtdXRhYmxlIC0+IHNp emVfdCB7CisgICAgICAgICAgICAgICAgY29uc3QgY2hhciogbmVnb3RpYXRpb25SZXNwb25zZSA9 ICIiCisgICAgICAgICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgQ29ubmVjdGlvbiBFc3RhYmxp c2hlZFxyXG4iCisgICAgICAgICAgICAgICAgICAgICJDb25uZWN0aW9uOiBjbG9zZVxyXG5cclxu IjsKKyAgICAgICAgICAgICAgICBhdXRvIHJlc3BvbnNlID0gYWRvcHROUyhkaXNwYXRjaF9kYXRh X2NyZWF0ZShuZWdvdGlhdGlvblJlc3BvbnNlLCBzdHJsZW4obmVnb3RpYXRpb25SZXNwb25zZSks IG51bGxwdHIsIG51bGxwdHIpKTsKKyAgICAgICAgICAgICAgICBud19mcmFtZXJfd3JpdGVfb3V0 cHV0X2RhdGEocmV0YWluZWRGcmFtZXIuZ2V0KCksIHJlc3BvbnNlLmdldCgpKTsKKyAgICAgICAg ICAgICAgICBud19mcmFtZXJfbWFya19yZWFkeShyZXRhaW5lZEZyYW1lci5nZXQoKSk7CisgICAg ICAgICAgICAgICAgbndfZnJhbWVyX3Bhc3NfdGhyb3VnaF9pbnB1dChyZXRhaW5lZEZyYW1lci5n ZXQoKSk7CisgICAgICAgICAgICAgICAgbndfZnJhbWVyX3Bhc3NfdGhyb3VnaF9vdXRwdXQocmV0 YWluZWRGcmFtZXIuZ2V0KCkpOworICAgICAgICAgICAgICAgIHJldGFpbmVkRnJhbWVyID0gbnVs bHB0cjsKKyAgICAgICAgICAgICAgICByZXR1cm4gYnVmZmVyTGVuZ3RoOworICAgICAgICAgICAg fSk7CisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBu d19mcmFtZXJfc3RhcnRfcmVzdWx0X3dpbGxfbWFya19yZWFkeTsKKyAgICB9KSk7Cit9CisKIFJl dGFpblB0cjxud19wYXJhbWV0ZXJzX3Q+IEhUVFBTZXJ2ZXI6Omxpc3RlbmVyUGFyYW1ldGVycyhQ cm90b2NvbCBwcm90b2NvbCwgQ2VydGlmaWNhdGVWZXJpZmllciYmIHZlcmlmaWVyLCBSZXRhaW5Q dHI8U2VjSWRlbnRpdHlSZWY+JiYgY3VzdG9tVGVzdElkZW50aXR5LCBzdGQ6Om9wdGlvbmFsPHVp bnQxNl90PiBwb3J0KQogewogICAgIGlmIChwcm90b2NvbCAhPSBQcm90b2NvbDo6SHR0cCAmJiAh Y3VzdG9tVGVzdElkZW50aXR5KQogICAgICAgICBjdXN0b21UZXN0SWRlbnRpdHkgPSB0ZXN0SWRl bnRpdHkoKTsKLSAgICBhdXRvIGNvbmZpZ3VyZVRMUyA9IHByb3RvY29sID09IFByb3RvY29sOjpI dHRwID8gbWFrZUJsb2NrUHRyKE5XX1BBUkFNRVRFUlNfRElTQUJMRV9QUk9UT0NPTCkgOiBtYWtl QmxvY2tQdHIoW3Byb3RvY29sLCB2ZXJpZmllciA9IFdURk1vdmUodmVyaWZpZXIpLCB0ZXN0SWRl bnRpdHkgPSBXVEZNb3ZlKGN1c3RvbVRlc3RJZGVudGl0eSldIChud19wcm90b2NvbF9vcHRpb25z X3QgcHJvdG9jb2xPcHRpb25zKSBtdXRhYmxlIHsKKworICAgIGF1dG8gY29uZmlndXJlVExTID0g W3Byb3RvY29sLCB2ZXJpZmllciA9IFdURk1vdmUodmVyaWZpZXIpLCB0ZXN0SWRlbnRpdHkgPSBX VEZNb3ZlKGN1c3RvbVRlc3RJZGVudGl0eSldIChud19wcm90b2NvbF9vcHRpb25zX3QgcHJvdG9j b2xPcHRpb25zKSBtdXRhYmxlIHsKICNpZiBIQVZFKFRMU19QUk9UT0NPTF9WRVJTSU9OX1QpCiAg ICAgICAgIGF1dG8gb3B0aW9ucyA9IGFkb3B0TlMobndfdGxzX2NvcHlfc2VjX3Byb3RvY29sX29w dGlvbnMocHJvdG9jb2xPcHRpb25zKSk7CiAgICAgICAgIGF1dG8gaWRlbnRpdHkgPSBhZG9wdE5T KHNlY19pZGVudGl0eV9jcmVhdGUodGVzdElkZW50aXR5LmdldCgpKSk7CkBAIC03NSwxMCArOTgs MjMgQEAgUmV0YWluUHRyPG53X3BhcmFtZXRlcnNfdD4gSFRUUFNlcnZlcjo6bGlzdGVuZXJQYXJh bWV0ZXJzKFByb3RvY29sIHByb3RvY29sLCBDZXIKICAgICAgICAgVU5VU0VEX1BBUkFNKHByb3Rv Y29sT3B0aW9ucyk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQocHJvdG9jb2wsIHByb3RvY29sICE9 IFByb3RvY29sOjpIdHRwc1dpdGhMZWdhY3lUTFMpOwogI2VuZGlmCi0gICAgfSk7Ci0gICAgYXV0 byBwYXJhbWV0ZXJzID0gYWRvcHROUyhud19wYXJhbWV0ZXJzX2NyZWF0ZV9zZWN1cmVfdGNwKGNv bmZpZ3VyZVRMUy5nZXQoKSwgTldfUEFSQU1FVEVSU19ERUZBVUxUX0NPTkZJR1VSQVRJT04pKTsK KyAgICB9OworCisgICAgYXV0byBjb25maWd1cmVUTFNCbG9jayA9IHByb3RvY29sID09IFByb3Rv Y29sOjpIdHRwIHx8IHByb3RvY29sID09IFByb3RvY29sOjpIdHRwc1Byb3h5ID8gbWFrZUJsb2Nr UHRyKE5XX1BBUkFNRVRFUlNfRElTQUJMRV9QUk9UT0NPTCkgOiBtYWtlQmxvY2tQdHIoV1RGTW92 ZShjb25maWd1cmVUTFMpKTsKKyAgICBhdXRvIHBhcmFtZXRlcnMgPSBhZG9wdE5TKG53X3BhcmFt ZXRlcnNfY3JlYXRlX3NlY3VyZV90Y3AoY29uZmlndXJlVExTQmxvY2suZ2V0KCksIE5XX1BBUkFN RVRFUlNfREVGQVVMVF9DT05GSUdVUkFUSU9OKSk7CiAgICAgaWYgKHBvcnQpCiAgICAgICAgIG53 X3BhcmFtZXRlcnNfc2V0X2xvY2FsX2VuZHBvaW50KHBhcmFtZXRlcnMuZ2V0KCksIG53X2VuZHBv aW50X2NyZWF0ZV9ob3N0KCI6OiIsIG1ha2VTdHJpbmcoKnBvcnQpLnV0ZjgoKS5kYXRhKCkpKTsK KworICAgIGlmIChwcm90b2NvbCA9PSBQcm90b2NvbDo6SHR0cHNQcm94eSkgeworICAgICAgICBh dXRvIHN0YWNrID0gYWRvcHROUyhud19wYXJhbWV0ZXJzX2NvcHlfZGVmYXVsdF9wcm90b2NvbF9z dGFjayhwYXJhbWV0ZXJzLmdldCgpKSk7CisgICAgICAgIGF1dG8gb3B0aW9ucyA9IGFkb3B0TlMo bndfZnJhbWVyX2NyZWF0ZV9vcHRpb25zKHByb3h5RGVmaW5pdGlvbigpLmdldCgpKSk7CisgICAg ICAgIG53X3Byb3RvY29sX3N0YWNrX3ByZXBlbmRfYXBwbGljYXRpb25fcHJvdG9jb2woc3RhY2su Z2V0KCksIG9wdGlvbnMuZ2V0KCkpOworCisgICAgICAgIGF1dG8gdGxzT3B0aW9ucyA9IGFkb3B0 TlMobndfdGxzX2NyZWF0ZV9vcHRpb25zKCkpOworICAgICAgICBjb25maWd1cmVUTFModGxzT3B0 aW9ucy5nZXQoKSk7CisgICAgICAgIG53X3Byb3RvY29sX3N0YWNrX3ByZXBlbmRfYXBwbGljYXRp b25fcHJvdG9jb2woc3RhY2suZ2V0KCksIHRsc09wdGlvbnMuZ2V0KCkpOworICAgIH0KKwogICAg IHJldHVybiBwYXJhbWV0ZXJzOwogfQogCkBAIC0xNjAsOCArMTk2LDggQEAgdm9pZCBIVFRQU2Vy dmVyOjpyZXNwb25kV2l0aE9LKENvbm5lY3Rpb24gY29ubmVjdGlvbikKICAgICBjb25uZWN0aW9u LnJlY2VpdmVIVFRQUmVxdWVzdChbY29ubmVjdGlvbl0gKFZlY3RvcjxjaGFyPiYmKSB7CiAgICAg ICAgIGNvbm5lY3Rpb24uc2VuZCgKICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgot ICAgICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAxM1xyXG5cclxuIgotICAgICAgICAgICAgIkhl bGxvLCBXb3JsZCEiCisgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDM0XHJcblxyXG4iCisg ICAgICAgICAgICAiPHNjcmlwdD5hbGVydCgnc3VjY2VzcyEnKTwvc2NyaXB0PiIKICAgICAgICAg KTsKICAgICB9KTsKIH0KQEAgLTI3OCw2ICszMTQsOCBAQCBOU1VSTFJlcXVlc3QgKkhUVFBTZXJ2 ZXI6OnJlcXVlc3QoY29uc3QgU3RyaW5nJiBwYXRoKSBjb25zdAogICAgIGNhc2UgUHJvdG9jb2w6 Okh0dHAyOgogICAgICAgICBmb3JtYXQgPSBAImh0dHBzOi8vMTI3LjAuMC4xOiVkJXMiOwogICAg ICAgICBicmVhazsKKyAgICBjYXNlIFByb3RvY29sOjpIdHRwc1Byb3h5OgorICAgICAgICBBU1NF UlRfTk9UX1JFQUNIRUQoKTsKICAgICB9CiAgICAgcmV0dXJuIFtOU1VSTFJlcXVlc3QgcmVxdWVz dFdpdGhVUkw6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6 Zm9ybWF0LCBwb3J0KCksIHBhdGgudXRmOCgpLmRhdGEoKV1dXTsKIH0K 439933 2021-10-01 16:55:00 -0700 2021-10-01 17:22:34 -0700 Patch bug-231109-20211001165459.patch text/plain 7897 achristensen U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzMzk1CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMWZiMzY5NzQ4OTBhM2IxNjEwNDhjNzY4MzczMzc4OTQ4 YjY2NmI1My4uZTBjZWFlODJhN2NkMmM3N2Y2OWU3NDg3OWQzN2JmNmM3ZjQzNjRkNSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDIxLTEwLTAxICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5v cmc+CisKKyAgICAgICAgSW1wbGVtZW50IEhUVFBTIHByb3h5IGluIEhUVFBTZXJ2ZXIKKyAgICAg ICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzMTEwOQorCisgICAg ICAgIFJldmlld2VkIGJ5IEdlb2ZmIEdhcmVuLgorCisgICAgICAgIFByZXZpb3VzbHkgd2UgdXNl ZCBUQ1BTZXJ2ZXIgZm9yIHRoaXMsIHdoaWNoIGlzIHBpY2t5IGFib3V0IHRoZSBleGFjdCBudW1i ZXIgb2YgY29ubmVjdGlvbnMsIHJlcXVlc3RzLCBhbmQgcmVwbGllcy4KKyAgICAgICAgSWYgZXZl cnl0aGluZyBpc24ndCBwZXJmZWN0LCBpdCBoYW5ncyBpbiB0aGUgVENQU2VydmVyIGRlc3RydWN0 b3IuCisgICAgICAgIEl0IGFsc28gZG9lc24ndCBydW4gdGhlIHNlcnZlciBsb2dpYyBvbiB0aGUg bWFpbiB0aHJlYWQuCisgICAgICAgIFRoaXMgd2lsbCBhbGxvdyBtaWdyYXRpb24gdG8gSFRUUFNl cnZlciwgdGhlIHJlcGxhY2VtZW50IGZvciBUQ1BTZXJ2ZXIuCisKKyAgICAgICAgKiBUZXN0V2Vi S2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tOgorICAgICAgICAoVGVzdFdlYktpdEFQ STo6VEVTVCk6CisgICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLmg6Cisg ICAgICAgICogVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tOgorICAgICAgICAoVGVz dFdlYktpdEFQSTo6cHJveHlEZWZpbml0aW9uKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkhU VFBTZXJ2ZXI6Omxpc3RlbmVyUGFyYW1ldGVycyk6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpI VFRQU2VydmVyOjpyZXNwb25kV2l0aE9LKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OkhUVFBT ZXJ2ZXI6OnJlcXVlc3QgY29uc3QpOgorCiAyMDIxLTEwLTAxICBKb25hdGhhbiBCZWRhcmQgIDxq YmVkYXJkQGFwcGxlLmNvbT4KIAogICAgICAgICBbd2Via2l0Y29yZXB5XSBBZGQgVGFza1Bvb2wg KEZvbGxvdy11cCBmaXgpCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dl YktpdENvY29hL1Byb3h5Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2Nv YS9Qcm94eS5tbQppbmRleCBiZjE1NDBlOGUyODlkMzE3NGYxMmI1ZTIwYjMyZjBlMGUxNjFkN2E4 Li4yOGU2NDgzZTZiMmE3MjA0NDI4NGY3NDU3NjNlMzhiNzkxMjMyODM1IDEwMDY0NAotLS0gYS9U b29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1Byb3h5Lm1tCisrKyBiL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViS2l0Q29jb2EvUHJveHkubW0KQEAgLTc4LDcgKzc4LDcg QEAgbmFtZXNwYWNlIFRlc3RXZWJLaXRBUEkgewogCiBURVNUKFdlYktpdCwgSFRUUFNQcm94eSkK IHsKLSAgICBUQ1BTZXJ2ZXIgc2VydmVyKFRDUFNlcnZlcjo6UHJvdG9jb2w6OkhUVFBTUHJveHks IFRDUFNlcnZlcjo6cmVzcG9uZFdpdGhPSyk7CisgICAgSFRUUFNlcnZlciBzZXJ2ZXIoSFRUUFNl cnZlcjo6cmVzcG9uZFdpdGhPSywgSFRUUFNlcnZlcjo6UHJvdG9jb2w6Okh0dHBzUHJveHkpOwog CiAgICAgYXV0byBzdG9yZUNvbmZpZ3VyYXRpb24gPSBhZG9wdE5TKFtfV0tXZWJzaXRlRGF0YVN0 b3JlQ29uZmlndXJhdGlvbiBuZXddKTsKICAgICBbc3RvcmVDb25maWd1cmF0aW9uIHNldEhUVFBT UHJveHk6W05TVVJMIFVSTFdpdGhTdHJpbmc6W05TU3RyaW5nIHN0cmluZ1dpdGhGb3JtYXQ6QCJo dHRwczovLzEyNy4wLjAuMTolZC8iLCBzZXJ2ZXIucG9ydCgpXV1dOwpkaWZmIC0tZ2l0IGEvVG9v bHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLmggYi9Ub29scy9UZXN0V2ViS2l0QVBJ L2NvY29hL0hUVFBTZXJ2ZXIuaAppbmRleCBjNTY2MTZiOGZkNDg1OTkyZjIzNDdmYThlN2FjZDc0 OGY1YjQyYTFhLi4wN2I3YTJhNTBjNjZhYTM4Yjg4NjI2NjhmMzMzYjE4NmViMGQyM2QwIDEwMDY0 NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaAorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2ZXIuaApAQCAtNDEsNyArNDEsNyBAQCBjbGFz cyBIVFRQU2VydmVyIHsKICAgICBXVEZfTUFLRV9GQVNUX0FMTE9DQVRFRDsKIHB1YmxpYzoKICAg ICBzdHJ1Y3QgUmVxdWVzdERhdGE7Ci0gICAgZW51bSBjbGFzcyBQcm90b2NvbCA6IHVpbnQ4X3Qg eyBIdHRwLCBIdHRwcywgSHR0cHNXaXRoTGVnYWN5VExTLCBIdHRwMiB9OworICAgIGVudW0gY2xh c3MgUHJvdG9jb2wgOiB1aW50OF90IHsgSHR0cCwgSHR0cHMsIEh0dHBzV2l0aExlZ2FjeVRMUywg SHR0cDIsIEh0dHBzUHJveHkgfTsKICAgICB1c2luZyBDZXJ0aWZpY2F0ZVZlcmlmaWVyID0gRnVu Y3Rpb248dm9pZChzZWNfcHJvdG9jb2xfbWV0YWRhdGFfdCwgc2VjX3RydXN0X3QsIHNlY19wcm90 b2NvbF92ZXJpZnlfY29tcGxldGVfdCk+OwogCiAgICAgSFRUUFNlcnZlcihzdGQ6OmluaXRpYWxp emVyX2xpc3Q8c3RkOjpwYWlyPFN0cmluZywgSFRUUFJlc3BvbnNlPj4sIFByb3RvY29sID0gUHJv dG9jb2w6Okh0dHAsIENlcnRpZmljYXRlVmVyaWZpZXImJiA9IG51bGxwdHIsIFJldGFpblB0cjxT ZWNJZGVudGl0eVJlZj4mJiA9IG51bGxwdHIsIHN0ZDo6b3B0aW9uYWw8dWludDE2X3Q+IHBvcnQg PSB7IH0pOwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVy Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9jb2NvYS9IVFRQU2VydmVyLm1tCmluZGV4IGQ3MjBi YTY0ZGI0MzA2OWJmNzM1YjMwNWJkZTMwZjQ0ZTc3ZTkyMGUuLmRhNmUxNzBhMTk3YWM1NmM0N2Fh MmRlYjc3MGY3YmVmM2JjMTYwNmYgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvY29j b2EvSFRUUFNlcnZlci5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL2NvY29hL0hUVFBTZXJ2 ZXIubW0KQEAgLTUyLDExICs1MiwzNCBAQCBzdHJ1Y3QgSFRUUFNlcnZlcjo6UmVxdWVzdERhdGEg OiBwdWJsaWMgVGhyZWFkU2FmZVJlZkNvdW50ZWQ8UmVxdWVzdERhdGEsIFdURjo6RAogICAgIFZl Y3RvcjxDb25uZWN0aW9uPiBjb25uZWN0aW9uczsKIH07CiAKK3N0YXRpYyBSZXRhaW5QdHI8bndf cHJvdG9jb2xfZGVmaW5pdGlvbl90PiBwcm94eURlZmluaXRpb24oKQoreworICAgIHJldHVybiBh ZG9wdE5TKG53X2ZyYW1lcl9jcmVhdGVfZGVmaW5pdGlvbigiSHR0cHNQcm94eSIsIE5XX0ZSQU1F Ul9DUkVBVEVfRkxBR1NfREVGQVVMVCwgW10gKG53X2ZyYW1lcl90IGZyYW1lcikgLT4gbndfZnJh bWVyX3N0YXJ0X3Jlc3VsdF90IHsKKyAgICAgICAgbndfZnJhbWVyX3NldF9pbnB1dF9oYW5kbGVy KGZyYW1lciwgW10gKG53X2ZyYW1lcl90IGZyYW1lcikgLT4gc2l6ZV90IHsKKyAgICAgICAgICAg IG53X2ZyYW1lcl9wYXJzZV9pbnB1dChmcmFtZXIsIDEsIHN0ZDo6bnVtZXJpY19saW1pdHM8dWlu dDMyX3Q+OjptYXgoKSwgbnVsbHB0ciwgW3JldGFpbmVkRnJhbWVyID0gcmV0YWluUHRyKGZyYW1l cildKHVpbnQ4X3QqLCBzaXplX3QgYnVmZmVyTGVuZ3RoLCBib29sKSBtdXRhYmxlIC0+IHNpemVf dCB7CisgICAgICAgICAgICAgICAgY29uc3QgY2hhciogbmVnb3RpYXRpb25SZXNwb25zZSA9ICIi CisgICAgICAgICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgQ29ubmVjdGlvbiBFc3RhYmxpc2hl ZFxyXG4iCisgICAgICAgICAgICAgICAgICAgICJDb25uZWN0aW9uOiBjbG9zZVxyXG5cclxuIjsK KyAgICAgICAgICAgICAgICBhdXRvIHJlc3BvbnNlID0gYWRvcHROUyhkaXNwYXRjaF9kYXRhX2Ny ZWF0ZShuZWdvdGlhdGlvblJlc3BvbnNlLCBzdHJsZW4obmVnb3RpYXRpb25SZXNwb25zZSksIG51 bGxwdHIsIG51bGxwdHIpKTsKKyAgICAgICAgICAgICAgICBud19mcmFtZXJfd3JpdGVfb3V0cHV0 X2RhdGEocmV0YWluZWRGcmFtZXIuZ2V0KCksIHJlc3BvbnNlLmdldCgpKTsKKyAgICAgICAgICAg ICAgICBud19mcmFtZXJfbWFya19yZWFkeShyZXRhaW5lZEZyYW1lci5nZXQoKSk7CisgICAgICAg ICAgICAgICAgbndfZnJhbWVyX3Bhc3NfdGhyb3VnaF9pbnB1dChyZXRhaW5lZEZyYW1lci5nZXQo KSk7CisgICAgICAgICAgICAgICAgbndfZnJhbWVyX3Bhc3NfdGhyb3VnaF9vdXRwdXQocmV0YWlu ZWRGcmFtZXIuZ2V0KCkpOworICAgICAgICAgICAgICAgIHJldGFpbmVkRnJhbWVyID0gbnVsbHB0 cjsKKyAgICAgICAgICAgICAgICByZXR1cm4gYnVmZmVyTGVuZ3RoOworICAgICAgICAgICAgfSk7 CisgICAgICAgICAgICByZXR1cm4gMDsKKyAgICAgICAgfSk7CisgICAgICAgIHJldHVybiBud19m cmFtZXJfc3RhcnRfcmVzdWx0X3dpbGxfbWFya19yZWFkeTsKKyAgICB9KSk7Cit9CisKIFJldGFp blB0cjxud19wYXJhbWV0ZXJzX3Q+IEhUVFBTZXJ2ZXI6Omxpc3RlbmVyUGFyYW1ldGVycyhQcm90 b2NvbCBwcm90b2NvbCwgQ2VydGlmaWNhdGVWZXJpZmllciYmIHZlcmlmaWVyLCBSZXRhaW5QdHI8 U2VjSWRlbnRpdHlSZWY+JiYgY3VzdG9tVGVzdElkZW50aXR5LCBzdGQ6Om9wdGlvbmFsPHVpbnQx Nl90PiBwb3J0KQogewogICAgIGlmIChwcm90b2NvbCAhPSBQcm90b2NvbDo6SHR0cCAmJiAhY3Vz dG9tVGVzdElkZW50aXR5KQogICAgICAgICBjdXN0b21UZXN0SWRlbnRpdHkgPSB0ZXN0SWRlbnRp dHkoKTsKLSAgICBhdXRvIGNvbmZpZ3VyZVRMUyA9IHByb3RvY29sID09IFByb3RvY29sOjpIdHRw ID8gbWFrZUJsb2NrUHRyKE5XX1BBUkFNRVRFUlNfRElTQUJMRV9QUk9UT0NPTCkgOiBtYWtlQmxv Y2tQdHIoW3Byb3RvY29sLCB2ZXJpZmllciA9IFdURk1vdmUodmVyaWZpZXIpLCB0ZXN0SWRlbnRp dHkgPSBXVEZNb3ZlKGN1c3RvbVRlc3RJZGVudGl0eSldIChud19wcm90b2NvbF9vcHRpb25zX3Qg cHJvdG9jb2xPcHRpb25zKSBtdXRhYmxlIHsKKworICAgIGF1dG8gY29uZmlndXJlVExTID0gW3By b3RvY29sLCB2ZXJpZmllciA9IFdURk1vdmUodmVyaWZpZXIpLCB0ZXN0SWRlbnRpdHkgPSBXVEZN b3ZlKGN1c3RvbVRlc3RJZGVudGl0eSldIChud19wcm90b2NvbF9vcHRpb25zX3QgcHJvdG9jb2xP cHRpb25zKSBtdXRhYmxlIHsKICNpZiBIQVZFKFRMU19QUk9UT0NPTF9WRVJTSU9OX1QpCiAgICAg ICAgIGF1dG8gb3B0aW9ucyA9IGFkb3B0TlMobndfdGxzX2NvcHlfc2VjX3Byb3RvY29sX29wdGlv bnMocHJvdG9jb2xPcHRpb25zKSk7CiAgICAgICAgIGF1dG8gaWRlbnRpdHkgPSBhZG9wdE5TKHNl Y19pZGVudGl0eV9jcmVhdGUodGVzdElkZW50aXR5LmdldCgpKSk7CkBAIC03NSwxMCArOTgsMjMg QEAgUmV0YWluUHRyPG53X3BhcmFtZXRlcnNfdD4gSFRUUFNlcnZlcjo6bGlzdGVuZXJQYXJhbWV0 ZXJzKFByb3RvY29sIHByb3RvY29sLCBDZXIKICAgICAgICAgVU5VU0VEX1BBUkFNKHByb3RvY29s T3B0aW9ucyk7CiAgICAgICAgIEFTU0VSVF9VTlVTRUQocHJvdG9jb2wsIHByb3RvY29sICE9IFBy b3RvY29sOjpIdHRwc1dpdGhMZWdhY3lUTFMpOwogI2VuZGlmCi0gICAgfSk7Ci0gICAgYXV0byBw YXJhbWV0ZXJzID0gYWRvcHROUyhud19wYXJhbWV0ZXJzX2NyZWF0ZV9zZWN1cmVfdGNwKGNvbmZp Z3VyZVRMUy5nZXQoKSwgTldfUEFSQU1FVEVSU19ERUZBVUxUX0NPTkZJR1VSQVRJT04pKTsKKyAg ICB9OworCisgICAgYXV0byBjb25maWd1cmVUTFNCbG9jayA9IHByb3RvY29sID09IFByb3RvY29s OjpIdHRwIHx8IHByb3RvY29sID09IFByb3RvY29sOjpIdHRwc1Byb3h5ID8gbWFrZUJsb2NrUHRy KE5XX1BBUkFNRVRFUlNfRElTQUJMRV9QUk9UT0NPTCkgOiBtYWtlQmxvY2tQdHIoV1RGTW92ZShj b25maWd1cmVUTFMpKTsKKyAgICBhdXRvIHBhcmFtZXRlcnMgPSBhZG9wdE5TKG53X3BhcmFtZXRl cnNfY3JlYXRlX3NlY3VyZV90Y3AoY29uZmlndXJlVExTQmxvY2suZ2V0KCksIE5XX1BBUkFNRVRF UlNfREVGQVVMVF9DT05GSUdVUkFUSU9OKSk7CiAgICAgaWYgKHBvcnQpCiAgICAgICAgIG53X3Bh cmFtZXRlcnNfc2V0X2xvY2FsX2VuZHBvaW50KHBhcmFtZXRlcnMuZ2V0KCksIG53X2VuZHBvaW50 X2NyZWF0ZV9ob3N0KCI6OiIsIG1ha2VTdHJpbmcoKnBvcnQpLnV0ZjgoKS5kYXRhKCkpKTsKKwor ICAgIGlmIChwcm90b2NvbCA9PSBQcm90b2NvbDo6SHR0cHNQcm94eSkgeworICAgICAgICBhdXRv IHN0YWNrID0gYWRvcHROUyhud19wYXJhbWV0ZXJzX2NvcHlfZGVmYXVsdF9wcm90b2NvbF9zdGFj ayhwYXJhbWV0ZXJzLmdldCgpKSk7CisgICAgICAgIGF1dG8gb3B0aW9ucyA9IGFkb3B0TlMobndf ZnJhbWVyX2NyZWF0ZV9vcHRpb25zKHByb3h5RGVmaW5pdGlvbigpLmdldCgpKSk7CisgICAgICAg IG53X3Byb3RvY29sX3N0YWNrX3ByZXBlbmRfYXBwbGljYXRpb25fcHJvdG9jb2woc3RhY2suZ2V0 KCksIG9wdGlvbnMuZ2V0KCkpOworCisgICAgICAgIGF1dG8gdGxzT3B0aW9ucyA9IGFkb3B0TlMo bndfdGxzX2NyZWF0ZV9vcHRpb25zKCkpOworICAgICAgICBjb25maWd1cmVUTFModGxzT3B0aW9u cy5nZXQoKSk7CisgICAgICAgIG53X3Byb3RvY29sX3N0YWNrX3ByZXBlbmRfYXBwbGljYXRpb25f cHJvdG9jb2woc3RhY2suZ2V0KCksIHRsc09wdGlvbnMuZ2V0KCkpOworICAgIH0KKwogICAgIHJl dHVybiBwYXJhbWV0ZXJzOwogfQogCkBAIC0xNjAsOCArMTk2LDggQEAgdm9pZCBIVFRQU2VydmVy OjpyZXNwb25kV2l0aE9LKENvbm5lY3Rpb24gY29ubmVjdGlvbikKICAgICBjb25uZWN0aW9uLnJl Y2VpdmVIVFRQUmVxdWVzdChbY29ubmVjdGlvbl0gKFZlY3RvcjxjaGFyPiYmKSB7CiAgICAgICAg IGNvbm5lY3Rpb24uc2VuZCgKICAgICAgICAgICAgICJIVFRQLzEuMSAyMDAgT0tcclxuIgotICAg ICAgICAgICAgIkNvbnRlbnQtTGVuZ3RoOiAxM1xyXG5cclxuIgotICAgICAgICAgICAgIkhlbGxv LCBXb3JsZCEiCisgICAgICAgICAgICAiQ29udGVudC1MZW5ndGg6IDM0XHJcblxyXG4iCisgICAg ICAgICAgICAiPHNjcmlwdD5hbGVydCgnc3VjY2VzcyEnKTwvc2NyaXB0PiIKICAgICAgICAgKTsK ICAgICB9KTsKIH0KQEAgLTI2OCw3ICszMDQsNyBAQCB1aW50MTZfdCBIVFRQU2VydmVyOjpwb3J0 KCkgY29uc3QKIAogTlNVUkxSZXF1ZXN0ICpIVFRQU2VydmVyOjpyZXF1ZXN0KGNvbnN0IFN0cmlu ZyYgcGF0aCkgY29uc3QKIHsKLSAgICBOU1N0cmluZyAqZm9ybWF0OworICAgIE5TU3RyaW5nICpm b3JtYXQgPSBuaWw7CiAgICAgc3dpdGNoIChtX3Byb3RvY29sKSB7CiAgICAgY2FzZSBQcm90b2Nv bDo6SHR0cDoKICAgICAgICAgZm9ybWF0ID0gQCJodHRwOi8vMTI3LjAuMC4xOiVkJXMiOwpAQCAt Mjc4LDYgKzMxNCw4IEBAIE5TVVJMUmVxdWVzdCAqSFRUUFNlcnZlcjo6cmVxdWVzdChjb25zdCBT dHJpbmcmIHBhdGgpIGNvbnN0CiAgICAgY2FzZSBQcm90b2NvbDo6SHR0cDI6CiAgICAgICAgIGZv cm1hdCA9IEAiaHR0cHM6Ly8xMjcuMC4wLjE6JWQlcyI7CiAgICAgICAgIGJyZWFrOworICAgIGNh c2UgUHJvdG9jb2w6Okh0dHBzUHJveHk6CisgICAgICAgIFJFTEVBU0VfQVNTRVJUX05PVF9SRUFD SEVEKCk7CiAgICAgfQogICAgIHJldHVybiBbTlNVUkxSZXF1ZXN0IHJlcXVlc3RXaXRoVVJMOltO U1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OmZvcm1hdCwgcG9y dCgpLCBwYXRoLnV0ZjgoKS5kYXRhKCldXV07CiB9Cg==