174691 2017-07-20 14:10:49 -0700 Hook up ITP quirks to the needsSiteSpecificQuirks setting 2018-08-17 15:59:11 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 174533 174661 188710 1 cdumez cdumez bfulgham buildbot commit-queue darin dbates ggaren japhet jeremyj-wk sam oldest_to_newest 1330772 0 cdumez 2017-07-20 14:10:49 -0700 Hook up ITP quirks to the needsSiteSpecificQuirks setting. 1330791 1 316030 cdumez 2017-07-20 15:08:10 -0700 Created attachment 316030 Patch 1330815 2 316036 cdumez 2017-07-20 16:05:01 -0700 Created attachment 316036 Patch 1330828 3 316036 jeremyj-wk 2017-07-20 16:41:55 -0700 Comment on attachment 316036 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316036&action=review provisional r+ > Source/WebCore/ChangeLog:8 > + Hook up ITP quirks to the needsSiteSpecificQuirks setting to make it easier to nit: easier for 1330837 4 316043 cdumez 2017-07-20 16:57:27 -0700 Created attachment 316043 Patch 1330872 5 316043 darin 2017-07-20 18:11:38 -0700 Comment on attachment 316043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316043&action=review > Source/WebCore/loader/ResourceLoadObserver.cpp:65 > +#if PLATFORM(IOS) > + UNUSED_PARAM(page); > + > + // There is currently no way to toggle the needsSiteSpecificQuirks setting on iOS so we always enable > + // the site-specific quirks on iOS. > + return true; > +#else It is really strange that this logic is here rather than in Settings. 1330873 6 cdumez 2017-07-20 18:18:51 -0700 (In reply to Darin Adler from comment #5) > Comment on attachment 316043 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=316043&action=review > > > Source/WebCore/loader/ResourceLoadObserver.cpp:65 > > +#if PLATFORM(IOS) > > + UNUSED_PARAM(page); > > + > > + // There is currently no way to toggle the needsSiteSpecificQuirks setting on iOS so we always enable > > + // the site-specific quirks on iOS. > > + return true; > > +#else > > It is really strange that this logic is here rather than in Settings. The setting is disabled on iOS. However, I need the ITP quirk on iOS as well. We could enable the setting on iOS but then it would enable other quirks than ITP on iOS, which would be risky at this point. 1330878 7 316043 commit-queue 2017-07-20 18:39:01 -0700 Comment on attachment 316043 Patch Clearing flags on attachment: 316043 Committed r219711: <http://trac.webkit.org/changeset/219711> 1330879 8 commit-queue 2017-07-20 18:39:04 -0700 All reviewed patches have been landed. Closing bug. 1330980 9 316043 darin 2017-07-21 09:28:09 -0700 Comment on attachment 316043 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=316043&action=review >>> Source/WebCore/loader/ResourceLoadObserver.cpp:65 >>> +#else >> >> It is really strange that this logic is here rather than in Settings. > > The setting is disabled on iOS. However, I need the ITP quirk on iOS as well. We could enable the setting on iOS but then it would enable other quirks than ITP on iOS, which would be risky at this point. Ah, so site-specific quirks have been non-iOS-only up until now. That seems sloppy and seems worth cleaning up when we have a chance. 1363688 10 bfulgham 2017-10-24 09:04:20 -0700 <rdar://problem/33465715> 316030 2017-07-20 15:08:10 -0700 2017-07-20 16:05:00 -0700 Patch bug-174691-20170720150810.patch text/plain 6277 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NzA1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNWVjYTQwZTUwMjU1MGY0 MGVhNWMxNDBlN2NlZmU0MTVjZTJhOTRkOS4uZTZmYThhM2QyYTQ2M2NlYzg0MGU1YjllMjhkOTc0 YmFiYWJlMGQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTA3LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgSG9vayB1cCBJVFAgcXVpcmtz IHRvIHRoZSBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcyBzZXR0aW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ2OTEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIb29rIHVwIElUUCBxdWlya3MgdG8gdGhl IG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzIHNldHRpbmcgdG8gbWFrZSBpdCBlYXNpZXIgdG8KKyAg ICAgICAgV2ViLWRldmVsb3BlcnMgdG8gdGVzdCB0aGVpciBmaXhlcy4KKworICAgICAgICAqIGxv YWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRF bmFibGVTaXRlU3BlY2lmaWNRdWlya3MpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fz c29jaWF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0Zy YW1lTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpyZXNvdXJjZU5lZWRzU1NPUXVpcmsp OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNl TG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2Vi U29ja2V0TG9hZGluZyk6CisKKzIwMTctMDctMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKwogICAgICAgICBSZWdyZXNzaW9uKElUUCk6IE1heSBnZXQgZnJlcXVlbnRseSBsb2dn ZWQgb3V0IG9mIHdzai5jb20KICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTE3NDY2MQogICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzIzNDMyNTY+CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwIGIv U291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcAppbmRleCA5YmVk ZDU5NDNlMzEwMmYwOWNlOTM0NTQzM2IzODNiMmY2NGNhNDc1Li41NWEzNTQ5ODRmYzE0ZGI5ZWI4 OTI5ZWU4YzY3YzMxNGRkOWUzMGQ2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIv UmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRPYnNlcnZlci5jcHAKQEAgLTU0LDggKzU0LDE5IEBAIFJlc291cmNlTG9hZE9ic2Vy dmVyJiBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6c2hhcmVkKCkKICAgICByZXR1cm4gcmVzb3VyY2VM b2FkT2JzZXJ2ZXI7CiB9CiAKK3N0YXRpYyBib29sIHNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1 aXJrcyhQYWdlKiBwYWdlKQoreworI2lmIFBMQVRGT1JNKElPUykKKyAgICAvLyBUaGVyZSBpcyBj dXJyZW50bHkgbm8gd2F5IHRvIHRvZ2dsZSB0aGUgbmVlZHNTaXRlU3BlY2lmaWNRdWlya3Mgc2V0 dGluZyBvbiBpT1Mgc28gd2UgYWx3YXlzIGVuYWJsZQorICAgIC8vIHRoZSBzaXRlLXNwZWNpZmlj IHF1aXJrcyBvbiBpT1MuCisgICAgcmV0dXJuIHRydWU7CisjZWxzZQorICAgIHJldHVybiBwYWdl ICYmIHBhZ2UtPnNldHRpbmdzKCkubmVlZHNTaXRlU3BlY2lmaWNRdWlya3MoKTsKKyNlbmRpZgor fQorCiAvLyBGSVhNRTogVGVtcG9yYXJ5IGZpeCBmb3IgPHJkYXI6Ly9wcm9ibGVtLzMyMzQzMjU2 PiB1bnRpbCBjb250ZW50IGNhbiBiZSB1cGRhdGVkLgotc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fz c29jaWF0ZWQoY29uc3QgU3RyaW5nJiBmaXJzdERvbWFpbiwgY29uc3QgU3RyaW5nJiBzZWNvbmRE b21haW4pCitzdGF0aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChQYWdlKiBwYWdlLCBjb25z dCBTdHJpbmcmIGZpcnN0RG9tYWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKIHsKICAg ICBzdGF0aWMgTmV2ZXJEZXN0cm95ZWQ8SGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVkPj4gbWV0YURv bWFpbklkZW50aWZpZXJzID0gW10gewogICAgICAgICBIYXNoTWFwPFN0cmluZywgdW5zaWduZWQ+ IG1hcDsKQEAgLTc2LDYgKzg3LDkgQEAgc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fzc29jaWF0ZWQo Y29uc3QgU3RyaW5nJiBmaXJzdERvbWFpbiwgY29uc3QgU3RyaW5nJiBzZWNvbmQKIAogICAgIEFT U0VSVCghZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZShmaXJzdERvbWFpbiwgc2Vjb25kRG9tYWluKSk7 CiAKKyAgICBpZiAoIXNob3VsZEVuYWJsZVNpdGVTcGVjaWZpY1F1aXJrcyhwYWdlKSkKKyAgICAg ICAgcmV0dXJuIGZhbHNlOworCiAgICAgdW5zaWduZWQgZmlyc3RNZXRhRG9tYWluSWRlbnRpZmll ciA9IG1ldGFEb21haW5JZGVudGlmaWVycy5nZXQoKS5nZXQoZmlyc3REb21haW4pOwogICAgIGlm ICghZmlyc3RNZXRhRG9tYWluSWRlbnRpZmllcikKICAgICAgICAgcmV0dXJuIGZhbHNlOwpAQCAt MTM1LDcgKzE0OSw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdh dGlvbihjb25zdCBGcmFtZSYgZnJhbWUsIGNvbnN0IEZyYW1lJiB0CiAgICAgaWYgKGZyYW1lLmlz TWFpbkZyYW1lKCkpCiAgICAgICAgIHJldHVybjsKICAgICAKLSAgICBpZiAoIXNob3VsZExvZyh0 b3BGcmFtZS5wYWdlKCkpKQorICAgIGF1dG8qIHBhZ2UgPSB0b3BGcmFtZS5wYWdlKCk7CisgICAg aWYgKCFzaG91bGRMb2cocGFnZSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIHNvdXJj ZVVSTCA9IGZyYW1lLmRvY3VtZW50KCktPnVybCgpOwpAQCAtMTU1LDcgKzE3MCw3IEBAIHZvaWQg UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25zdCBGcmFtZSYgZnJh bWUsIGNvbnN0IEZyYW1lJiB0CiAgICAgYXV0byBtYWluRnJhbWVQcmltYXJ5RG9tYWluID0gcHJp bWFyeURvbWFpbihtYWluRnJhbWVVUkwpOwogICAgIGF1dG8gc291cmNlUHJpbWFyeURvbWFpbiA9 IHByaW1hcnlEb21haW4oc291cmNlVVJMKTsKICAgICAKLSAgICBpZiAoYXJlRG9tYWluc0Fzc29j aWF0ZWQodGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbikgfHwgYXJl RG9tYWluc0Fzc29jaWF0ZWQodGFyZ2V0UHJpbWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFp bikpCisgICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21h aW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pIHx8IGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2Us IHRhcmdldFByaW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4pKQogICAgICAgICByZXR1 cm47CiAKICAgICBhdXRvJiB0YXJnZXRTdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0 aWNzRm9yUHJpbWFyeURvbWFpbih0YXJnZXRQcmltYXJ5RG9tYWluKTsKQEAgLTE2NiwxOSArMTgx LDIwIEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0ZyYW1lTmF2aWdhdGlvbihjb25z dCBGcmFtZSYgZnJhbWUsIGNvbnN0IEZyYW1lJiB0CiB9CiAKIC8vIEZJWE1FOiBUaGlzIHF1aXJr IHdhcyBhZGRlZCB0byBhZGRyZXNzIDxyZGFyOi8vcHJvYmxlbS8zMzMyNTg4MT4gYW5kIHNob3Vs ZCBiZSByZW1vdmVkIG9uY2UgY29udGVudCBpcyBmaXhlZC4KLXN0YXRpYyBib29sIHJlc291cmNl TmVlZHNTU09RdWlyayhjb25zdCBVUkwmIHVybCkKK3N0YXRpYyBib29sIHJlc291cmNlTmVlZHNT U09RdWlyayhQYWdlKiBwYWdlLCBjb25zdCBVUkwmIHVybCkKIHsKLSAgICBzdGF0aWMgY29uc3Qg YXV0byBzc29PcmlnaW5zSGFzaCA9IG1ha2VOZXZlckRlc3Ryb3llZChIYXNoU2V0PFN0cmluZywg QVNDSUlDYXNlSW5zZW5zaXRpdmVIYXNoPiB7Ci0gICAgICAgICJzcC5hdXRoLmFkb2JlLmNvbSIK LSAgICB9KTsKLSAgICByZXR1cm4gc3NvT3JpZ2luc0hhc2guZ2V0KCkuY29udGFpbnModXJsLmhv c3QoKSk7CisgICAgaWYgKCFzaG91bGRFbmFibGVTaXRlU3BlY2lmaWNRdWlya3MocGFnZSkpCisg ICAgICAgIHJldHVybiBmYWxzZTsKKworICAgIHJldHVybiBlcXVhbElnbm9yaW5nQVNDSUlDYXNl KHVybC5ob3N0KCksICJzcC5hdXRoLmFkb2JlLmNvbSIpOwogfQogCiB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxvYWRpbmcoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25z dCBSZXNvdXJjZVJlcXVlc3QmIG5ld1JlcXVlc3QsIGNvbnN0IFJlc291cmNlUmVzcG9uc2UmIHJl ZGlyZWN0UmVzcG9uc2UpCiB7CiAgICAgQVNTRVJUKGZyYW1lLT5wYWdlKCkpOwogCi0gICAgaWYg KCFzaG91bGRMb2coZnJhbWUtPnBhZ2UoKSkpCisgICAgYXV0byogcGFnZSA9IGZyYW1lLT5wYWdl KCk7CisgICAgaWYgKCFzaG91bGRMb2cocGFnZSkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJv b2wgaXNSZWRpcmVjdCA9IGlzM3h4UmVkaXJlY3QocmVkaXJlY3RSZXNwb25zZSk7CkBAIC0xOTYs MTAgKzIxMiwxMCBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJjZUxv YWRpbmcoY29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBSZXNvdQogICAgIGF1dG8gbWFpbkZyYW1l UHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4obWFpbkZyYW1lVVJMKTsKICAgICBhdXRvIHNv dXJjZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWluKHNvdXJjZVVSTCk7CiAgICAgCi0gICAg aWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHRhcmdldFByaW1hcnlEb21haW4sIG1haW5GcmFtZVBy aW1hcnlEb21haW4pIHx8IChpc1JlZGlyZWN0ICYmIGFyZURvbWFpbnNBc3NvY2lhdGVkKHRhcmdl dFByaW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21haW4pKSkKKyAgICBpZiAoYXJlRG9tYWlu c0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURv bWFpbikgfHwgKGlzUmVkaXJlY3QgJiYgYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0 UHJpbWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURvbWFpbikpKQogICAgICAgICByZXR1cm47CiAK LSAgICBpZiAocmVzb3VyY2VOZWVkc1NTT1F1aXJrKHRhcmdldFVSTCkpCisgICAgaWYgKHJlc291 cmNlTmVlZHNTU09RdWlyayhwYWdlLCB0YXJnZXRVUkwpKQogICAgICAgICByZXR1cm47CiAKICAg ICBib29sIHNob3VsZENhbGxOb3RpZmljYXRpb25DYWxsYmFjayA9IGZhbHNlOwpAQCAtMjI3LDcg KzI0Myw4IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmco Y29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHRhCiAgICAgaWYgKCFmcmFtZSkKICAgICAg ICAgcmV0dXJuOwogCi0gICAgaWYgKCFzaG91bGRMb2coZnJhbWUtPnBhZ2UoKSkpCisgICAgYXV0 byogcGFnZSA9IGZyYW1lLT5wYWdlKCk7CisgICAgaWYgKCFzaG91bGRMb2cocGFnZSkpCiAgICAg ICAgIHJldHVybjsKIAogICAgIGF1dG8mIG1haW5GcmFtZVVSTCA9IGZyYW1lLT5tYWluRnJhbWUo KS5kb2N1bWVudCgpLT51cmwoKTsKQEAgLTI0MSw3ICsyNTgsNyBAQCB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dXZWJTb2NrZXRMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3Qg VVJMJiB0YQogICAgIGF1dG8gdGFyZ2V0UHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4odGFy Z2V0VVJMKTsKICAgICBhdXRvIG1haW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWlu KG1haW5GcmFtZVVSTCk7CiAgICAgCi0gICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHRhcmdl dFByaW1hcnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pKQorICAgIGlmIChhcmVEb21h aW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5 RG9tYWluKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGljcyA9 IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFyeURv bWFpbik7Cg== 316036 2017-07-20 16:05:01 -0700 2017-07-20 16:57:26 -0700 Patch bug-174691-20170720160501.patch text/plain 6245 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg1YWFmNmM4NDQwMjcw MDljN2JlNmQ3NzYxYTRiNTY1Y2Q1Mjg2ZS4uYjFiZjNiOTIxOTYzYjI0OTQ2ZTA5M2I1YzEzYmE5 MjJmMTAxMDM2MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTA3LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgSG9vayB1cCBJVFAgcXVpcmtz IHRvIHRoZSBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcyBzZXR0aW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ2OTEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIb29rIHVwIElUUCBxdWlya3MgdG8gdGhl IG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzIHNldHRpbmcgdG8gbWFrZSBpdCBlYXNpZXIgdG8KKyAg ICAgICAgV2ViLWRldmVsb3BlcnMgdG8gdGVzdCB0aGVpciBmaXhlcy4KKworICAgICAgICAqIGxv YWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHA6CisgICAgICAgIChXZWJDb3JlOjpzaG91bGRF bmFibGVTaXRlU3BlY2lmaWNRdWlya3MpOgorICAgICAgICAoV2ViQ29yZTo6YXJlRG9tYWluc0Fz c29jaWF0ZWQpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ0Zy YW1lTmF2aWdhdGlvbik6CisgICAgICAgIChXZWJDb3JlOjpyZXNvdXJjZU5lZWRzU1NPUXVpcmsp OgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNl TG9hZGluZyk6CisgICAgICAgIChXZWJDb3JlOjpSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2Vi U29ja2V0TG9hZGluZyk6CisKKzIwMTctMDctMjAgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxl LmNvbT4KKwogICAgICAgICBEcm9wIGxlZ2FjeSBYUGF0aEV4Y2VwdGlvbiB0eXBlCiAgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ2NzkKIApkaWZmIC0t Z2l0IGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291cmNlTG9hZE9ic2VydmVyLmNwcCBiL1Nv dXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKaW5kZXggOWJlZGQ1 OTQzZTMxMDJmMDljZTkzNDU0MzNiMzgzYjJmNjRjYTQ3NS4uMzdiNzEwZTUxZWZjM2JhMjQ0ZTA1 MGVkYjhiY2M0Y2IwMmI5YWJkNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jl c291cmNlTG9hZE9ic2VydmVyLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3Vy Y2VMb2FkT2JzZXJ2ZXIuY3BwCkBAIC01NCw4ICs1NCwyMSBAQCBSZXNvdXJjZUxvYWRPYnNlcnZl ciYgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OnNoYXJlZCgpCiAgICAgcmV0dXJuIHJlc291cmNlTG9h ZE9ic2VydmVyOwogfQogCitzdGF0aWMgYm9vbCBzaG91bGRFbmFibGVTaXRlU3BlY2lmaWNRdWly a3MoUGFnZSogcGFnZSkKK3sKKyNpZiBQTEFURk9STShJT1MpCisgICAgVU5VU0VEX1BBUkFNKHBh Z2UpOworCisgICAgLy8gVGhlcmUgaXMgY3VycmVudGx5IG5vIHdheSB0byB0b2dnbGUgdGhlIG5l ZWRzU2l0ZVNwZWNpZmljUXVpcmtzIHNldHRpbmcgb24gaU9TIHNvIHdlIGFsd2F5cyBlbmFibGUK KyAgICAvLyB0aGUgc2l0ZS1zcGVjaWZpYyBxdWlya3Mgb24gaU9TLgorICAgIHJldHVybiB0cnVl OworI2Vsc2UKKyAgICByZXR1cm4gcGFnZSAmJiBwYWdlLT5zZXR0aW5ncygpLm5lZWRzU2l0ZVNw ZWNpZmljUXVpcmtzKCk7CisjZW5kaWYKK30KKwogLy8gRklYTUU6IFRlbXBvcmFyeSBmaXggZm9y IDxyZGFyOi8vcHJvYmxlbS8zMjM0MzI1Nj4gdW50aWwgY29udGVudCBjYW4gYmUgdXBkYXRlZC4K LXN0YXRpYyBib29sIGFyZURvbWFpbnNBc3NvY2lhdGVkKGNvbnN0IFN0cmluZyYgZmlyc3REb21h aW4sIGNvbnN0IFN0cmluZyYgc2Vjb25kRG9tYWluKQorc3RhdGljIGJvb2wgYXJlRG9tYWluc0Fz c29jaWF0ZWQoUGFnZSogcGFnZSwgY29uc3QgU3RyaW5nJiBmaXJzdERvbWFpbiwgY29uc3QgU3Ry aW5nJiBzZWNvbmREb21haW4pCiB7CiAgICAgc3RhdGljIE5ldmVyRGVzdHJveWVkPEhhc2hNYXA8 U3RyaW5nLCB1bnNpZ25lZD4+IG1ldGFEb21haW5JZGVudGlmaWVycyA9IFtdIHsKICAgICAgICAg SGFzaE1hcDxTdHJpbmcsIHVuc2lnbmVkPiBtYXA7CkBAIC03Niw2ICs4OSw5IEBAIHN0YXRpYyBi b29sIGFyZURvbWFpbnNBc3NvY2lhdGVkKGNvbnN0IFN0cmluZyYgZmlyc3REb21haW4sIGNvbnN0 IFN0cmluZyYgc2Vjb25kCiAKICAgICBBU1NFUlQoIWVxdWFsSWdub3JpbmdBU0NJSUNhc2UoZmly c3REb21haW4sIHNlY29uZERvbWFpbikpOwogCisgICAgaWYgKCFzaG91bGRFbmFibGVTaXRlU3Bl Y2lmaWNRdWlya3MocGFnZSkpCisgICAgICAgIHJldHVybiBmYWxzZTsKKwogICAgIHVuc2lnbmVk IGZpcnN0TWV0YURvbWFpbklkZW50aWZpZXIgPSBtZXRhRG9tYWluSWRlbnRpZmllcnMuZ2V0KCku Z2V0KGZpcnN0RG9tYWluKTsKICAgICBpZiAoIWZpcnN0TWV0YURvbWFpbklkZW50aWZpZXIpCiAg ICAgICAgIHJldHVybiBmYWxzZTsKQEAgLTEzNSw3ICsxNTEsOCBAQCB2b2lkIFJlc291cmNlTG9h ZE9ic2VydmVyOjpsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBG cmFtZSYgdAogICAgIGlmIChmcmFtZS5pc01haW5GcmFtZSgpKQogICAgICAgICByZXR1cm47CiAg ICAgCi0gICAgaWYgKCFzaG91bGRMb2codG9wRnJhbWUucGFnZSgpKSkKKyAgICBhdXRvKiBwYWdl ID0gdG9wRnJhbWUucGFnZSgpOworICAgIGlmICghc2hvdWxkTG9nKHBhZ2UpKQogICAgICAgICBy ZXR1cm47CiAKICAgICBhdXRvJiBzb3VyY2VVUkwgPSBmcmFtZS5kb2N1bWVudCgpLT51cmwoKTsK QEAgLTE1NSw3ICsxNzIsNyBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dGcmFtZU5h dmlnYXRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBGcmFtZSYgdAogICAgIGF1dG8gbWFp bkZyYW1lUHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4obWFpbkZyYW1lVVJMKTsKICAgICBh dXRvIHNvdXJjZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWluKHNvdXJjZVVSTCk7CiAgICAg Ci0gICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHRhcmdldFByaW1hcnlEb21haW4sIG1haW5G cmFtZVByaW1hcnlEb21haW4pIHx8IGFyZURvbWFpbnNBc3NvY2lhdGVkKHRhcmdldFByaW1hcnlE b21haW4sIHNvdXJjZVByaW1hcnlEb21haW4pKQorICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRl ZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCBh cmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3VyY2VQcmlt YXJ5RG9tYWluKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgdGFyZ2V0U3RhdGlzdGlj cyA9IGVuc3VyZVJlc291cmNlU3RhdGlzdGljc0ZvclByaW1hcnlEb21haW4odGFyZ2V0UHJpbWFy eURvbWFpbik7CkBAIC0xNjYsMTkgKzE4MywyMCBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2VydmVy Ojpsb2dGcmFtZU5hdmlnYXRpb24oY29uc3QgRnJhbWUmIGZyYW1lLCBjb25zdCBGcmFtZSYgdAog fQogCiAvLyBGSVhNRTogVGhpcyBxdWlyayB3YXMgYWRkZWQgdG8gYWRkcmVzcyA8cmRhcjovL3By b2JsZW0vMzMzMjU4ODE+IGFuZCBzaG91bGQgYmUgcmVtb3ZlZCBvbmNlIGNvbnRlbnQgaXMgZml4 ZWQuCi1zdGF0aWMgYm9vbCByZXNvdXJjZU5lZWRzU1NPUXVpcmsoY29uc3QgVVJMJiB1cmwpCitz dGF0aWMgYm9vbCByZXNvdXJjZU5lZWRzU1NPUXVpcmsoUGFnZSogcGFnZSwgY29uc3QgVVJMJiB1 cmwpCiB7Ci0gICAgc3RhdGljIGNvbnN0IGF1dG8gc3NvT3JpZ2luc0hhc2ggPSBtYWtlTmV2ZXJE ZXN0cm95ZWQoSGFzaFNldDxTdHJpbmcsIEFTQ0lJQ2FzZUluc2Vuc2l0aXZlSGFzaD4gewotICAg ICAgICAic3AuYXV0aC5hZG9iZS5jb20iCi0gICAgfSk7Ci0gICAgcmV0dXJuIHNzb09yaWdpbnNI YXNoLmdldCgpLmNvbnRhaW5zKHVybC5ob3N0KCkpOworICAgIGlmICghc2hvdWxkRW5hYmxlU2l0 ZVNwZWNpZmljUXVpcmtzKHBhZ2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKKyAgICByZXR1 cm4gZXF1YWxJZ25vcmluZ0FTQ0lJQ2FzZSh1cmwuaG9zdCgpLCAic3AuYXV0aC5hZG9iZS5jb20i KTsKIH0KIAogdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nU3VicmVzb3VyY2VMb2FkaW5n KGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3QgUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0LCBj b25zdCBSZXNvdXJjZVJlc3BvbnNlJiByZWRpcmVjdFJlc3BvbnNlKQogewogICAgIEFTU0VSVChm cmFtZS0+cGFnZSgpKTsKIAotICAgIGlmICghc2hvdWxkTG9nKGZyYW1lLT5wYWdlKCkpKQorICAg IGF1dG8qIHBhZ2UgPSBmcmFtZS0+cGFnZSgpOworICAgIGlmICghc2hvdWxkTG9nKHBhZ2UpKQog ICAgICAgICByZXR1cm47CiAKICAgICBib29sIGlzUmVkaXJlY3QgPSBpczN4eFJlZGlyZWN0KHJl ZGlyZWN0UmVzcG9uc2UpOwpAQCAtMTk2LDEwICsyMTQsMTAgQEAgdm9pZCBSZXNvdXJjZUxvYWRP YnNlcnZlcjo6bG9nU3VicmVzb3VyY2VMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3Qg UmVzb3UKICAgICBhdXRvIG1haW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWluKG1h aW5GcmFtZVVSTCk7CiAgICAgYXV0byBzb3VyY2VQcmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFp bihzb3VyY2VVUkwpOwogICAgIAotICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRlZCh0YXJnZXRQ cmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCAoaXNSZWRpcmVjdCAmJiBh cmVEb21haW5zQXNzb2NpYXRlZCh0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3VyY2VQcmltYXJ5RG9t YWluKSkpCisgICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlE b21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pIHx8IChpc1JlZGlyZWN0ICYmIGFyZURvbWFp bnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1hcnlEb21haW4sIHNvdXJjZVByaW1hcnlEb21h aW4pKSkKICAgICAgICAgcmV0dXJuOwogCi0gICAgaWYgKHJlc291cmNlTmVlZHNTU09RdWlyayh0 YXJnZXRVUkwpKQorICAgIGlmIChyZXNvdXJjZU5lZWRzU1NPUXVpcmsocGFnZSwgdGFyZ2V0VVJM KSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYm9vbCBzaG91bGRDYWxsTm90aWZpY2F0aW9uQ2Fs bGJhY2sgPSBmYWxzZTsKQEAgLTIyNyw3ICsyNDUsOCBAQCB2b2lkIFJlc291cmNlTG9hZE9ic2Vy dmVyOjpsb2dXZWJTb2NrZXRMb2FkaW5nKGNvbnN0IEZyYW1lKiBmcmFtZSwgY29uc3QgVVJMJiB0 YQogICAgIGlmICghZnJhbWUpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmICghc2hvdWxkTG9n KGZyYW1lLT5wYWdlKCkpKQorICAgIGF1dG8qIHBhZ2UgPSBmcmFtZS0+cGFnZSgpOworICAgIGlm ICghc2hvdWxkTG9nKHBhZ2UpKQogICAgICAgICByZXR1cm47CiAKICAgICBhdXRvJiBtYWluRnJh bWVVUkwgPSBmcmFtZS0+bWFpbkZyYW1lKCkuZG9jdW1lbnQoKS0+dXJsKCk7CkBAIC0yNDEsNyAr MjYwLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nV2ViU29ja2V0TG9hZGluZyhj b25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYgdGEKICAgICBhdXRvIHRhcmdldFByaW1hcnlE b21haW4gPSBwcmltYXJ5RG9tYWluKHRhcmdldFVSTCk7CiAgICAgYXV0byBtYWluRnJhbWVQcmlt YXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbihtYWluRnJhbWVVUkwpOwogICAgIAotICAgIGlmIChh cmVEb21haW5zQXNzb2NpYXRlZCh0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5 RG9tYWluKSkKKyAgICBpZiAoYXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFy eURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbikpCiAgICAgICAgIHJldHVybjsKIAogICAg IGF1dG8mIHRhcmdldFN0YXRpc3RpY3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmlt YXJ5RG9tYWluKHRhcmdldFByaW1hcnlEb21haW4pOwo= 316043 2017-07-20 16:57:27 -0700 2017-07-20 18:39:01 -0700 Patch bug-174691-20170720165727.patch text/plain 6246 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjE5NzA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMjg1YWFmNmM4NDQwMjcw MDljN2JlNmQ3NzYxYTRiNTY1Y2Q1Mjg2ZS4uOTZhMzU2ZDIzOWZkMmQ0MTI5MjRlZGIwYzBjYjM0 YTViNzYzNThhMyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDIzIEBACiAyMDE3LTA3LTIwICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CiAKKyAgICAgICAgSG9vayB1cCBJVFAgcXVpcmtz IHRvIHRoZSBuZWVkc1NpdGVTcGVjaWZpY1F1aXJrcyBzZXR0aW5nCisgICAgICAgIGh0dHBzOi8v YnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNzQ2OTEKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBIb29rIHVwIElUUCBxdWlya3MgdG8gdGhl IG5lZWRzU2l0ZVNwZWNpZmljUXVpcmtzIHNldHRpbmcgdG8gbWFrZSBpdCBlYXNpZXIgZm9yCisg ICAgICAgIFdlYi1kZXZlbG9wZXJzIHRvIHRlc3QgdGhlaXIgZml4ZXMuCisKKyAgICAgICAgKiBs b2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6c2hvdWxk RW5hYmxlU2l0ZVNwZWNpZmljUXVpcmtzKToKKyAgICAgICAgKFdlYkNvcmU6OmFyZURvbWFpbnNB c3NvY2lhdGVkKToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dG cmFtZU5hdmlnYXRpb24pOgorICAgICAgICAoV2ViQ29yZTo6cmVzb3VyY2VOZWVkc1NTT1F1aXJr KToKKyAgICAgICAgKFdlYkNvcmU6OlJlc291cmNlTG9hZE9ic2VydmVyOjpsb2dTdWJyZXNvdXJj ZUxvYWRpbmcpOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dl YlNvY2tldExvYWRpbmcpOgorCisyMDE3LTA3LTIwICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBs ZS5jb20+CisKICAgICAgICAgRHJvcCBsZWdhY3kgWFBhdGhFeGNlcHRpb24gdHlwZQogICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTc0Njc5CiAKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVzb3VyY2VMb2FkT2JzZXJ2ZXIuY3BwCmluZGV4IDliZWRk NTk0M2UzMTAyZjA5Y2U5MzQ1NDMzYjM4M2IyZjY0Y2E0NzUuLjM3YjcxMGU1MWVmYzNiYTI0NGUw NTBlZGI4YmNjNGNiMDJiOWFiZDcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9S ZXNvdXJjZUxvYWRPYnNlcnZlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL1Jlc291 cmNlTG9hZE9ic2VydmVyLmNwcApAQCAtNTQsOCArNTQsMjEgQEAgUmVzb3VyY2VMb2FkT2JzZXJ2 ZXImIFJlc291cmNlTG9hZE9ic2VydmVyOjpzaGFyZWQoKQogICAgIHJldHVybiByZXNvdXJjZUxv YWRPYnNlcnZlcjsKIH0KIAorc3RhdGljIGJvb2wgc2hvdWxkRW5hYmxlU2l0ZVNwZWNpZmljUXVp cmtzKFBhZ2UqIHBhZ2UpCit7CisjaWYgUExBVEZPUk0oSU9TKQorICAgIFVOVVNFRF9QQVJBTShw YWdlKTsKKworICAgIC8vIFRoZXJlIGlzIGN1cnJlbnRseSBubyB3YXkgdG8gdG9nZ2xlIHRoZSBu ZWVkc1NpdGVTcGVjaWZpY1F1aXJrcyBzZXR0aW5nIG9uIGlPUyBzbyB3ZSBhbHdheXMgZW5hYmxl CisgICAgLy8gdGhlIHNpdGUtc3BlY2lmaWMgcXVpcmtzIG9uIGlPUy4KKyAgICByZXR1cm4gdHJ1 ZTsKKyNlbHNlCisgICAgcmV0dXJuIHBhZ2UgJiYgcGFnZS0+c2V0dGluZ3MoKS5uZWVkc1NpdGVT cGVjaWZpY1F1aXJrcygpOworI2VuZGlmCit9CisKIC8vIEZJWE1FOiBUZW1wb3JhcnkgZml4IGZv ciA8cmRhcjovL3Byb2JsZW0vMzIzNDMyNTY+IHVudGlsIGNvbnRlbnQgY2FuIGJlIHVwZGF0ZWQu Ci1zdGF0aWMgYm9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChjb25zdCBTdHJpbmcmIGZpcnN0RG9t YWluLCBjb25zdCBTdHJpbmcmIHNlY29uZERvbWFpbikKK3N0YXRpYyBib29sIGFyZURvbWFpbnNB c3NvY2lhdGVkKFBhZ2UqIHBhZ2UsIGNvbnN0IFN0cmluZyYgZmlyc3REb21haW4sIGNvbnN0IFN0 cmluZyYgc2Vjb25kRG9tYWluKQogewogICAgIHN0YXRpYyBOZXZlckRlc3Ryb3llZDxIYXNoTWFw PFN0cmluZywgdW5zaWduZWQ+PiBtZXRhRG9tYWluSWRlbnRpZmllcnMgPSBbXSB7CiAgICAgICAg IEhhc2hNYXA8U3RyaW5nLCB1bnNpZ25lZD4gbWFwOwpAQCAtNzYsNiArODksOSBAQCBzdGF0aWMg Ym9vbCBhcmVEb21haW5zQXNzb2NpYXRlZChjb25zdCBTdHJpbmcmIGZpcnN0RG9tYWluLCBjb25z dCBTdHJpbmcmIHNlY29uZAogCiAgICAgQVNTRVJUKCFlcXVhbElnbm9yaW5nQVNDSUlDYXNlKGZp cnN0RG9tYWluLCBzZWNvbmREb21haW4pKTsKIAorICAgIGlmICghc2hvdWxkRW5hYmxlU2l0ZVNw ZWNpZmljUXVpcmtzKHBhZ2UpKQorICAgICAgICByZXR1cm4gZmFsc2U7CisKICAgICB1bnNpZ25l ZCBmaXJzdE1ldGFEb21haW5JZGVudGlmaWVyID0gbWV0YURvbWFpbklkZW50aWZpZXJzLmdldCgp LmdldChmaXJzdERvbWFpbik7CiAgICAgaWYgKCFmaXJzdE1ldGFEb21haW5JZGVudGlmaWVyKQog ICAgICAgICByZXR1cm4gZmFsc2U7CkBAIC0xMzUsNyArMTUxLDggQEAgdm9pZCBSZXNvdXJjZUxv YWRPYnNlcnZlcjo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3Qg RnJhbWUmIHQKICAgICBpZiAoZnJhbWUuaXNNYWluRnJhbWUoKSkKICAgICAgICAgcmV0dXJuOwog ICAgIAotICAgIGlmICghc2hvdWxkTG9nKHRvcEZyYW1lLnBhZ2UoKSkpCisgICAgYXV0byogcGFn ZSA9IHRvcEZyYW1lLnBhZ2UoKTsKKyAgICBpZiAoIXNob3VsZExvZyhwYWdlKSkKICAgICAgICAg cmV0dXJuOwogCiAgICAgYXV0byYgc291cmNlVVJMID0gZnJhbWUuZG9jdW1lbnQoKS0+dXJsKCk7 CkBAIC0xNTUsNyArMTcyLDcgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZlcjo6bG9nRnJhbWVO YXZpZ2F0aW9uKGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgRnJhbWUmIHQKICAgICBhdXRvIG1h aW5GcmFtZVByaW1hcnlEb21haW4gPSBwcmltYXJ5RG9tYWluKG1haW5GcmFtZVVSTCk7CiAgICAg YXV0byBzb3VyY2VQcmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbihzb3VyY2VVUkwpOwogICAg IAotICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRlZCh0YXJnZXRQcmltYXJ5RG9tYWluLCBtYWlu RnJhbWVQcmltYXJ5RG9tYWluKSB8fCBhcmVEb21haW5zQXNzb2NpYXRlZCh0YXJnZXRQcmltYXJ5 RG9tYWluLCBzb3VyY2VQcmltYXJ5RG9tYWluKSkKKyAgICBpZiAoYXJlRG9tYWluc0Fzc29jaWF0 ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbikgfHwg YXJlRG9tYWluc0Fzc29jaWF0ZWQocGFnZSwgdGFyZ2V0UHJpbWFyeURvbWFpbiwgc291cmNlUHJp bWFyeURvbWFpbikpCiAgICAgICAgIHJldHVybjsKIAogICAgIGF1dG8mIHRhcmdldFN0YXRpc3Rp Y3MgPSBlbnN1cmVSZXNvdXJjZVN0YXRpc3RpY3NGb3JQcmltYXJ5RG9tYWluKHRhcmdldFByaW1h cnlEb21haW4pOwpAQCAtMTY2LDE5ICsxODMsMjAgQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNlcnZl cjo6bG9nRnJhbWVOYXZpZ2F0aW9uKGNvbnN0IEZyYW1lJiBmcmFtZSwgY29uc3QgRnJhbWUmIHQK IH0KIAogLy8gRklYTUU6IFRoaXMgcXVpcmsgd2FzIGFkZGVkIHRvIGFkZHJlc3MgPHJkYXI6Ly9w cm9ibGVtLzMzMzI1ODgxPiBhbmQgc2hvdWxkIGJlIHJlbW92ZWQgb25jZSBjb250ZW50IGlzIGZp eGVkLgotc3RhdGljIGJvb2wgcmVzb3VyY2VOZWVkc1NTT1F1aXJrKGNvbnN0IFVSTCYgdXJsKQor c3RhdGljIGJvb2wgcmVzb3VyY2VOZWVkc1NTT1F1aXJrKFBhZ2UqIHBhZ2UsIGNvbnN0IFVSTCYg dXJsKQogewotICAgIHN0YXRpYyBjb25zdCBhdXRvIHNzb09yaWdpbnNIYXNoID0gbWFrZU5ldmVy RGVzdHJveWVkKEhhc2hTZXQ8U3RyaW5nLCBBU0NJSUNhc2VJbnNlbnNpdGl2ZUhhc2g+IHsKLSAg ICAgICAgInNwLmF1dGguYWRvYmUuY29tIgotICAgIH0pOwotICAgIHJldHVybiBzc29PcmlnaW5z SGFzaC5nZXQoKS5jb250YWlucyh1cmwuaG9zdCgpKTsKKyAgICBpZiAoIXNob3VsZEVuYWJsZVNp dGVTcGVjaWZpY1F1aXJrcyhwYWdlKSkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworCisgICAgcmV0 dXJuIGVxdWFsSWdub3JpbmdBU0NJSUNhc2UodXJsLmhvc3QoKSwgInNwLmF1dGguYWRvYmUuY29t Iik7CiB9CiAKIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNlTG9hZGlu Zyhjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFJlc291cmNlUmVxdWVzdCYgbmV3UmVxdWVzdCwg Y29uc3QgUmVzb3VyY2VSZXNwb25zZSYgcmVkaXJlY3RSZXNwb25zZSkKIHsKICAgICBBU1NFUlQo ZnJhbWUtPnBhZ2UoKSk7CiAKLSAgICBpZiAoIXNob3VsZExvZyhmcmFtZS0+cGFnZSgpKSkKKyAg ICBhdXRvKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBpZiAoIXNob3VsZExvZyhwYWdlKSkK ICAgICAgICAgcmV0dXJuOwogCiAgICAgYm9vbCBpc1JlZGlyZWN0ID0gaXMzeHhSZWRpcmVjdChy ZWRpcmVjdFJlc3BvbnNlKTsKQEAgLTE5NiwxMCArMjE0LDEwIEBAIHZvaWQgUmVzb3VyY2VMb2Fk T2JzZXJ2ZXI6OmxvZ1N1YnJlc291cmNlTG9hZGluZyhjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0 IFJlc291CiAgICAgYXV0byBtYWluRnJhbWVQcmltYXJ5RG9tYWluID0gcHJpbWFyeURvbWFpbiht YWluRnJhbWVVUkwpOwogICAgIGF1dG8gc291cmNlUHJpbWFyeURvbWFpbiA9IHByaW1hcnlEb21h aW4oc291cmNlVVJMKTsKICAgICAKLSAgICBpZiAoYXJlRG9tYWluc0Fzc29jaWF0ZWQodGFyZ2V0 UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFyeURvbWFpbikgfHwgKGlzUmVkaXJlY3QgJiYg YXJlRG9tYWluc0Fzc29jaWF0ZWQodGFyZ2V0UHJpbWFyeURvbWFpbiwgc291cmNlUHJpbWFyeURv bWFpbikpKQorICAgIGlmIChhcmVEb21haW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5 RG9tYWluLCBtYWluRnJhbWVQcmltYXJ5RG9tYWluKSB8fCAoaXNSZWRpcmVjdCAmJiBhcmVEb21h aW5zQXNzb2NpYXRlZChwYWdlLCB0YXJnZXRQcmltYXJ5RG9tYWluLCBzb3VyY2VQcmltYXJ5RG9t YWluKSkpCiAgICAgICAgIHJldHVybjsKIAotICAgIGlmIChyZXNvdXJjZU5lZWRzU1NPUXVpcmso dGFyZ2V0VVJMKSkKKyAgICBpZiAocmVzb3VyY2VOZWVkc1NTT1F1aXJrKHBhZ2UsIHRhcmdldFVS TCkpCiAgICAgICAgIHJldHVybjsKIAogICAgIGJvb2wgc2hvdWxkQ2FsbE5vdGlmaWNhdGlvbkNh bGxiYWNrID0gZmFsc2U7CkBAIC0yMjcsNyArMjQ1LDggQEAgdm9pZCBSZXNvdXJjZUxvYWRPYnNl cnZlcjo6bG9nV2ViU29ja2V0TG9hZGluZyhjb25zdCBGcmFtZSogZnJhbWUsIGNvbnN0IFVSTCYg dGEKICAgICBpZiAoIWZyYW1lKQogICAgICAgICByZXR1cm47CiAKLSAgICBpZiAoIXNob3VsZExv ZyhmcmFtZS0+cGFnZSgpKSkKKyAgICBhdXRvKiBwYWdlID0gZnJhbWUtPnBhZ2UoKTsKKyAgICBp ZiAoIXNob3VsZExvZyhwYWdlKSkKICAgICAgICAgcmV0dXJuOwogCiAgICAgYXV0byYgbWFpbkZy YW1lVVJMID0gZnJhbWUtPm1haW5GcmFtZSgpLmRvY3VtZW50KCktPnVybCgpOwpAQCAtMjQxLDcg KzI2MCw3IEBAIHZvaWQgUmVzb3VyY2VMb2FkT2JzZXJ2ZXI6OmxvZ1dlYlNvY2tldExvYWRpbmco Y29uc3QgRnJhbWUqIGZyYW1lLCBjb25zdCBVUkwmIHRhCiAgICAgYXV0byB0YXJnZXRQcmltYXJ5 RG9tYWluID0gcHJpbWFyeURvbWFpbih0YXJnZXRVUkwpOwogICAgIGF1dG8gbWFpbkZyYW1lUHJp bWFyeURvbWFpbiA9IHByaW1hcnlEb21haW4obWFpbkZyYW1lVVJMKTsKICAgICAKLSAgICBpZiAo YXJlRG9tYWluc0Fzc29jaWF0ZWQodGFyZ2V0UHJpbWFyeURvbWFpbiwgbWFpbkZyYW1lUHJpbWFy eURvbWFpbikpCisgICAgaWYgKGFyZURvbWFpbnNBc3NvY2lhdGVkKHBhZ2UsIHRhcmdldFByaW1h cnlEb21haW4sIG1haW5GcmFtZVByaW1hcnlEb21haW4pKQogICAgICAgICByZXR1cm47CiAKICAg ICBhdXRvJiB0YXJnZXRTdGF0aXN0aWNzID0gZW5zdXJlUmVzb3VyY2VTdGF0aXN0aWNzRm9yUHJp bWFyeURvbWFpbih0YXJnZXRQcmltYXJ5RG9tYWluKTsK