216115 2020-09-02 20:48:15 -0700 new URL("#") should throw an error 2022-07-04 22:34:18 -0700 1 1 1 Unclassified WebKit Web Template Framework WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ysuzuki achristensen achristensen cdumez changseok darin dpa-webkit esprehn+autocc ews-watchlist gyuyoung.kim hi kondapallykalyan webkit-bug-importer ysuzuki oldest_to_newest 1685137 0 ysuzuki 2020-09-02 20:48:15 -0700 https://github.com/whatwg/url/issues/539 1685138 1 webkit-bug-importer 2020-09-02 20:48:46 -0700 <rdar://problem/68252256> 1686663 2 408251 achristensen 2020-09-08 12:09:41 -0700 Created attachment 408251 Patch 1686669 3 408251 ysuzuki 2020-09-08 12:15:11 -0700 Comment on attachment 408251 Patch r=me 1686671 4 408251 darin 2020-09-08 12:18:21 -0700 Comment on attachment 408251 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408251&action=review > Source/WebCore/html/DOMURL.h:-43 > - static ExceptionOr<Ref<DOMURL>> create(const String& url, const DOMURL& base); Glad we are getting rid of this. I guess the specification changed since we originally wrote the code. > Source/WebCore/html/DOMURL.h:-44 > - static ExceptionOr<Ref<DOMURL>> create(const String& url, const URL& base); Does this "un-optimize" any call sites that were passing a URL before, or did those call sites just not exist? 1686687 5 408251 achristensen 2020-09-08 12:49:27 -0700 Comment on attachment 408251 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408251&action=review >> Source/WebCore/html/DOMURL.h:-44 >> - static ExceptionOr<Ref<DOMURL>> create(const String& url, const URL& base); > > Does this "un-optimize" any call sites that were passing a URL before, or did those call sites just not exist? Yes, this un-optimizes passing a DOM URL as the second parameter. It used to call the constructor with a const DOMURL& and after my first patch it turns it into a String and reparses it. I'll keep that optimization, which should be undetectable from JavaScript. 1686691 6 408257 achristensen 2020-09-08 12:50:27 -0700 Created attachment 408257 Patch 1686694 7 408257 darin 2020-09-08 12:56:11 -0700 Comment on attachment 408257 Patch I don’t understand how this fix works. If the baseURL is not valid, it seems like we’d get a TypeError exception, both before and after the patch. Where’s the fix? 1686698 8 408257 darin 2020-09-08 12:57:18 -0700 Comment on attachment 408257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408257&action=review > Source/WebCore/html/DOMURL.cpp:-51 > - if (!base.isValid()) > - return Exception { TypeError }; Wouldn’t a better fix be to add a special case to allow null here. > Source/WebCore/html/DOMURL.cpp:-60 > - return create(url, base.isNull() ? aboutBlankURL() : URL { URL { }, base }); And remove the special case for null here? 1686704 9 408257 achristensen 2020-09-08 13:04:08 -0700 Comment on attachment 408257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408257&action=review >> Source/WebCore/html/DOMURL.cpp:-51 >> - return Exception { TypeError }; > > Wouldn’t a better fix be to add a special case to allow null here. This is called from DOMURL::create(const String&, const DOMURL&) where we know the base is non-null and valid. That would be an unneeded check. It would probably be close to equivalent and the difference would probably be undetectable from JS, but I like the logic like this better. >> Source/WebCore/html/DOMURL.cpp:-60 >> - return create(url, base.isNull() ? aboutBlankURL() : URL { URL { }, base }); > > And remove the special case for null here? We need a check for null here because it is ok to not specify the base, in which case baseURL would be null which should not throw a type error. 1686737 10 achristensen 2020-09-08 14:09:03 -0700 http://trac.webkit.org/r266748 1686769 11 408257 hi 2020-09-08 15:35:13 -0700 Comment on attachment 408257 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=408257&action=review > LayoutTests/inspector/unit-tests/url-utilities.html:576 > + test(new URL("#hash", "about:blank"), "about:blank"); This may cause issues in Web Inspector, specifically usage of `WI.urlWithoutFragment` and `parseURL`. I don't know whether it's actually possible for Web Inspector to be given a Url that's just a fragment/hash, but I can't say for sure that it will never happen. 1686800 12 achristensen 2020-09-08 16:30:06 -0700 Ok. One can never be sure that a change won't cause any issues. Let's keep our eyes out, and if we see any we can reconsider this. 1880637 13 gsnedders 2022-07-04 22:34:18 -0700 *** Bug 216841 has been marked as a duplicate of this bug. *** 408251 2020-09-08 12:09:41 -0700 2020-09-08 12:50:25 -0700 Patch bug-216115-20200908120940.patch text/plain 5273 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NjczNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE4IEBACisyMDIwLTA5LTA4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgbmV3IFVSTCgi IyIpIHNob3VsZCB0aHJvdyBhbiBlcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgVGhpcyBhbGlnbnMgdGhlIERPTSBVUkwgb2JqZWN0IHdpdGggdGhl IHNwZWNpZmljYXRpb24gYW5kIEZpcmVmb3guCisgICAgICAgIENvdmVyZWQgYnkgYWRkaW5nIHRv IGZhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3IuaHRtbC4KKworICAgICAgICAqIGh0bWwv RE9NVVJMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVVSTDo6Y3JlYXRlKToKKyAgICAgICAg KiBodG1sL0RPTVVSTC5oOgorICAgICAgICAqIGh0bWwvRE9NVVJMLmlkbDoKKwogMjAyMC0wOS0w OCAgTWVnYW4gR2FyZG5lciAgPG1lZ2FuX2dhcmRuZXJAYXBwbGUuY29tPgogCiAgICAgICAgIFN3 aXRjaCBmcm9tIGRlcHJlY2F0ZWQgc2Vjb25kYXJ5U2VsZWN0ZWRDb250cm9sQ29sb3IgdG8gdW5l bXBoYXNpemVkU2VsZWN0ZWRDb250ZW50QmFja2dyb3VuZENvbG9yLgpJbmRleDogU291cmNlL1dl YkNvcmUvaHRtbC9ET01VUkwuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwv RE9NVVJMLmNwcAkocmV2aXNpb24gMjY2NzAzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9ET01V UkwuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC00NSwyNCArNDUsMTggQEAgaW5saW5lIERPTVVSTDo6 RE9NVVJMKFVSTCYmIGNvbXBsZXRlVVJMLAogewogfQogCi1FeGNlcHRpb25PcjxSZWY8RE9NVVJM Pj4gRE9NVVJMOjpjcmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFVSTCYgYmFzZSkKK0V4 Y2VwdGlvbk9yPFJlZjxET01VUkw+PiBET01VUkw6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwg Y29uc3QgU3RyaW5nJiBiYXNlKQogewotICAgIGlmICghYmFzZS5pc1ZhbGlkKCkpCi0gICAgICAg IHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJyb3IgfTsKLSAgICBVUkwgY29tcGxldGVVUkwgeyBi YXNlLCB1cmwgfTsKKyAgICBVUkwgYmFzZVVSTDsKKyAgICBpZiAoIWJhc2UuaXNOdWxsKCkpIHsK KyAgICAgICAgYmFzZVVSTCA9IFVSTCB7IFVSTCB7IH0sIGJhc2UgfTsKKyAgICAgICAgaWYgKCFi YXNlVVJMLmlzVmFsaWQoKSkKKyAgICAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBUeXBlRXJy b3IgfTsKKyAgICB9CisgICAgVVJMIGNvbXBsZXRlVVJMIHsgYmFzZVVSTCwgdXJsIH07CiAgICAg aWYgKCFjb21wbGV0ZVVSTC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBU eXBlRXJyb3IgfTsKLSAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBET01VUkwoV1RGTW92ZShjb21w bGV0ZVVSTCksIGJhc2UpKTsKLX0KLQotRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IERPTVVSTDo6 Y3JlYXRlKGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGJhc2UpCi17Ci0gICAgcmV0 dXJuIGNyZWF0ZSh1cmwsIGJhc2UuaXNOdWxsKCkgPyBhYm91dEJsYW5rVVJMKCkgOiBVUkwgeyBV UkwgeyB9LCBiYXNlIH0pOwotfQotCi1FeGNlcHRpb25PcjxSZWY8RE9NVVJMPj4gRE9NVVJMOjpj cmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IERPTVVSTCYgYmFzZSkKLXsKLSAgICByZXR1 cm4gY3JlYXRlKHVybCwgYmFzZS5ocmVmKCkpOworICAgIHJldHVybiBhZG9wdFJlZigqbmV3IERP TVVSTChXVEZNb3ZlKGNvbXBsZXRlVVJMKSwgYmFzZVVSTCkpOwogfQogCiBET01VUkw6On5ET01V UkwoKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9ET01VUkwuaAo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBT b3VyY2UvV2ViQ29yZS9odG1sL0RPTVVSTC5oCShyZXZpc2lvbiAyNjY3MDMpCisrKyBTb3VyY2Uv V2ViQ29yZS9odG1sL0RPTVVSTC5oCSh3b3JraW5nIGNvcHkpCkBAIC00MCw4ICs0MCw2IEBAIGNs YXNzIFVSTFNlYXJjaFBhcmFtczsKIGNsYXNzIERPTVVSTCBmaW5hbCA6IHB1YmxpYyBSZWZDb3Vu dGVkPERPTVVSTD4sIHB1YmxpYyBVUkxEZWNvbXBvc2l0aW9uIHsKIHB1YmxpYzoKICAgICBzdGF0 aWMgRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgY29u c3QgU3RyaW5nJiBiYXNlKTsKLSAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IGNy ZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgRE9NVVJMJiBiYXNlKTsKLSAgICBzdGF0aWMg RXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3Qg VVJMJiBiYXNlKTsKICAgICB+RE9NVVJMKCk7CiAKICAgICBjb25zdCBVUkwmIGhyZWYoKSBjb25z dCB7IHJldHVybiBtX3VybDsgfQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9ET01VUkwuaWRs Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvRE9NVVJMLmlkbAkocmV2aXNpb24g MjY2NzAzKQorKysgU291cmNlL1dlYkNvcmUvaHRtbC9ET01VUkwuaWRsCSh3b3JraW5nIGNvcHkp CkBAIC0zMyw3ICszMyw2IEBACiAgICAgTGVnYWN5V2luZG93QWxpYXM9d2Via2l0VVJMLAogXSBp bnRlcmZhY2UgRE9NVVJMIHsKICAgICBbTWF5VGhyb3dFeGNlcHRpb25dIGNvbnN0cnVjdG9yKFVT VlN0cmluZyB1cmwsIG9wdGlvbmFsIFVTVlN0cmluZyBiYXNlKTsKLSAgICBbTWF5VGhyb3dFeGNl cHRpb25dIGNvbnN0cnVjdG9yKFVTVlN0cmluZyB1cmwsIERPTVVSTCBiYXNlKTsKIAogICAgIFtV UkxdIHN0cmluZ2lmaWVyIGF0dHJpYnV0ZSBVU1ZTdHJpbmcgaHJlZjsKICAgICByZWFkb25seSBh dHRyaWJ1dGUgVVNWU3RyaW5nIG9yaWdpbjsKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2NjcwMykKKysr IExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisy MDIwLTA5LTA4ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisK KyAgICAgICAgbmV3IFVSTCgiIyIpIHNob3VsZCB0aHJvdyBhbiBlcnJvcgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MTE1CisKKyAgICAgICAgUmV2 aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBmYXN0L2RvbS9ET01VUkwvdXJs LWNvbnN0cnVjdG9yLmh0bWw6CisgICAgICAgICogZmFzdC9kb20vRE9NVVJML3VybC1jb25zdHJ1 Y3Rvci1leHBlY3RlZC50eHQ6CisKIDIwMjAtMDktMDYgIERhcmluIEFkbGVyICA8ZGFyaW5AYXBw bGUuY29tPgogCiAgICAgICAgIE1ha2UgVGV4dENvZGVjQ0pLIGFuZCBUZXh0Q29kZWNTaW5nbGVC eXRlIHRocmVhZC1zYWZlIGFuZCByZWZhY3RvciBhIGJpdCB0byBzaGFyZSBjb2RlCkluZGV4OiBM YXlvdXRUZXN0cy9mYXN0L2RvbS9ET01VUkwvdXJsLWNvbnN0cnVjdG9yLWV4cGVjdGVkLnR4dAo9 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9mYXN0L2RvbS9ET01VUkwvdXJsLWNvbnN0cnVjdG9y LWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjY2NzAzKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20v RE9NVVJML3VybC1jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTcs NiArNyw3IEBAIE9uZS1wYXJhbWV0ZXIgY29uc3RydWN0b3IgLSB2YWxpZCBVUkwKIFBBU1MgdXJs LmhyZWYgaXMgJ2h0dHA6Ly91c2VyOnBhc3NAZXhhbXBsZS5jb20vcGF0aD9xdWVyeSNmcmFnbWVu dCcKIE9uZS1wYXJhbWV0ZXIgY29uc3RydWN0b3IgLSBpbnZhbGlkIFVSTCBzaG91bGQgdGhyb3cK IFBBU1MgdXJsID0gbmV3IFVSTCgiJV4kIyIpIHRocmV3IGV4Y2VwdGlvbiBUeXBlRXJyb3I6IFR5 cGUgZXJyb3IuCitQQVNTIHVybCA9IG5ldyBVUkwoIiMiKSB0aHJldyBleGNlcHRpb24gVHlwZUVy cm9yOiBUeXBlIGVycm9yLgogT25lLXBhcmFtZXRlciBjb25zdHJ1Y3RvciAtIHJlbGF0aXZlIFVS TCBub3QgdmFsaWQgYWdhaW5zdCBkZWZhdWx0IGJhc2UKIFBBU1MgdXJsID0gbmV3IFVSTCgiZm9v YmFyIikgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIFVSTCB3aXRoIHN0 cmluZyBiYXNlCkluZGV4OiBMYXlvdXRUZXN0cy9mYXN0L2RvbS9ET01VUkwvdXJsLWNvbnN0cnVj dG9yLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vRE9NVVJML3VybC1j b25zdHJ1Y3Rvci5odG1sCShyZXZpc2lvbiAyNjY3MDMpCisrKyBMYXlvdXRUZXN0cy9mYXN0L2Rv bS9ET01VUkwvdXJsLWNvbnN0cnVjdG9yLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTE1LDYgKzE1 LDcgQEAgc2hvdWxkQmUoInVybC5ocmVmIiwgIidodHRwOi8vdXNlcjpwYXNzQAogCiBkZWJ1Zygi T25lLXBhcmFtZXRlciBjb25zdHJ1Y3RvciAtIGludmFsaWQgVVJMIHNob3VsZCB0aHJvdyIpOwog c2hvdWxkVGhyb3coJ3VybCA9IG5ldyBVUkwoIiVeJCMiKScpOworc2hvdWxkVGhyb3coJ3VybCA9 IG5ldyBVUkwoIiMiKScpOwogCiBkZWJ1ZygiT25lLXBhcmFtZXRlciBjb25zdHJ1Y3RvciAtIHJl bGF0aXZlIFVSTCBub3QgdmFsaWQgYWdhaW5zdCBkZWZhdWx0IGJhc2UiKTsKIHNob3VsZFRocm93 KCd1cmwgPSBuZXcgVVJMKCJmb29iYXIiKScpOwo= 408257 2020-09-08 12:50:27 -0700 2020-09-08 13:04:08 -0700 Patch bug-216115-20200908125027.patch text/plain 6364 achristensen SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI2Njc0MCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDIwLTA5LTA4ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgbmV3IFVSTCgi IyIpIHNob3VsZCB0aHJvdyBhbiBlcnJvcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjE2MTE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgWXVzdWtlIFN1 enVraSBhbmQgRGFyaW4gQWRsZXIuCisKKyAgICAgICAgVGhpcyBhbGlnbnMgdGhlIERPTSBVUkwg b2JqZWN0IHdpdGggdGhlIHNwZWNpZmljYXRpb24gYW5kIEZpcmVmb3guCisgICAgICAgIENvdmVy ZWQgYnkgYWRkaW5nIHRvIGZhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3IuaHRtbC4KKwor ICAgICAgICAqIGh0bWwvRE9NVVJMLmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkRPTVVSTDo6Y3Jl YXRlKToKKyAgICAgICAgKiBodG1sL0RPTVVSTC5oOgorCiAyMDIwLTA5LTA4ICBGcmFuayBZYW5n ICA8Z3Vvd2VpX3lhbmdAYXBwbGUuY29tPgogCiAgICAgICAgIENvcmVJbWFnZSBJbXBsZW1lbnRh dGlvbiBvZiBDU1MgRmlsdGVycyBpbnZlcnQoKSwgb3BhY2l0eSgpLCBicmlnaHRuZXNzKCksIGNv bnRyYXN0KCkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvRE9NVVJMLmNwcAo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0RPTVVSTC5jcHAJKHJldmlzaW9uIDI2NjcwMykKKysr IFNvdXJjZS9XZWJDb3JlL2h0bWwvRE9NVVJMLmNwcAkod29ya2luZyBjb3B5KQpAQCAtNDcsOCAr NDcsNyBAQCBpbmxpbmUgRE9NVVJMOjpET01VUkwoVVJMJiYgY29tcGxldGVVUkwsCiAKIEV4Y2Vw dGlvbk9yPFJlZjxET01VUkw+PiBET01VUkw6OmNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgY29u c3QgVVJMJiBiYXNlKQogewotICAgIGlmICghYmFzZS5pc1ZhbGlkKCkpCi0gICAgICAgIHJldHVy biBFeGNlcHRpb24geyBUeXBlRXJyb3IgfTsKKyAgICBBU1NFUlQoYmFzZS5pc1ZhbGlkKCkgfHwg YmFzZS5pc051bGwoKSk7CiAgICAgVVJMIGNvbXBsZXRlVVJMIHsgYmFzZSwgdXJsIH07CiAgICAg aWYgKCFjb21wbGV0ZVVSTC5pc1ZhbGlkKCkpCiAgICAgICAgIHJldHVybiBFeGNlcHRpb24geyBU eXBlRXJyb3IgfTsKQEAgLTU3LDcgKzU2LDEwIEBAIEV4Y2VwdGlvbk9yPFJlZjxET01VUkw+PiBE T01VUkw6OmNyZWF0ZSgKIAogRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IERPTVVSTDo6Y3JlYXRl KGNvbnN0IFN0cmluZyYgdXJsLCBjb25zdCBTdHJpbmcmIGJhc2UpCiB7Ci0gICAgcmV0dXJuIGNy ZWF0ZSh1cmwsIGJhc2UuaXNOdWxsKCkgPyBhYm91dEJsYW5rVVJMKCkgOiBVUkwgeyBVUkwgeyB9 LCBiYXNlIH0pOworICAgIFVSTCBiYXNlVVJMIHsgVVJMIHsgfSwgYmFzZSB9OworICAgIGlmICgh YmFzZS5pc051bGwoKSAmJiAhYmFzZVVSTC5pc1ZhbGlkKCkpCisgICAgICAgIHJldHVybiBFeGNl cHRpb24geyBUeXBlRXJyb3IgfTsKKyAgICByZXR1cm4gY3JlYXRlKHVybCwgYmFzZVVSTCk7CiB9 CiAKIEV4Y2VwdGlvbk9yPFJlZjxET01VUkw+PiBET01VUkw6OmNyZWF0ZShjb25zdCBTdHJpbmcm IHVybCwgY29uc3QgRE9NVVJMJiBiYXNlKQpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9ET01V UkwuaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9odG1sL0RPTVVSTC5oCShyZXZpc2lv biAyNjY3MDMpCisrKyBTb3VyY2UvV2ViQ29yZS9odG1sL0RPTVVSTC5oCSh3b3JraW5nIGNvcHkp CkBAIC00MSw3ICs0MSw2IEBAIGNsYXNzIERPTVVSTCBmaW5hbCA6IHB1YmxpYyBSZWZDb3VudGVk PEQKIHB1YmxpYzoKICAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IGNyZWF0ZShj b25zdCBTdHJpbmcmIHVybCwgY29uc3QgU3RyaW5nJiBiYXNlKTsKICAgICBzdGF0aWMgRXhjZXB0 aW9uT3I8UmVmPERPTVVSTD4+IGNyZWF0ZShjb25zdCBTdHJpbmcmIHVybCwgY29uc3QgRE9NVVJM JiBiYXNlKTsKLSAgICBzdGF0aWMgRXhjZXB0aW9uT3I8UmVmPERPTVVSTD4+IGNyZWF0ZShjb25z dCBTdHJpbmcmIHVybCwgY29uc3QgVVJMJiBiYXNlKTsKICAgICB+RE9NVVJMKCk7CiAKICAgICBj b25zdCBVUkwmIGhyZWYoKSBjb25zdCB7IHJldHVybiBtX3VybDsgfQpAQCAtNTgsNiArNTcsNyBA QCBwdWJsaWM6CiAgICAgc3RhdGljIFN0cmluZyBjcmVhdGVQdWJsaWNVUkwoU2NyaXB0RXhlY3V0 aW9uQ29udGV4dCYsIFVSTFJlZ2lzdHJhYmxlJik7CiAKIHByaXZhdGU6CisgICAgc3RhdGljIEV4 Y2VwdGlvbk9yPFJlZjxET01VUkw+PiBjcmVhdGUoY29uc3QgU3RyaW5nJiB1cmwsIGNvbnN0IFVS TCYgYmFzZSk7CiAgICAgRE9NVVJMKFVSTCYmIGNvbXBsZXRlVVJMLCBjb25zdCBVUkwmIGJhc2VV UkwpOwogCiAgICAgVVJMIGZ1bGxVUkwoKSBjb25zdCBmaW5hbCB7IHJldHVybiBtX3VybDsgfQpJ bmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL0No YW5nZUxvZwkocmV2aXNpb24gMjY2NzQyKQorKysgTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCSh3b3Jr aW5nIGNvcHkpCkBAIC0xLDMgKzEsMTUgQEAKKzIwMjAtMDktMDggIEFsZXggQ2hyaXN0ZW5zZW4g IDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAgICBuZXcgVVJMKCIjIikgc2hvdWxk IHRocm93IGFuIGVycm9yCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMTYxMTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICAqIGZhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3ItZXhwZWN0ZWQudHh0Ogor ICAgICAgICAqIGZhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3IuaHRtbDoKKyAgICAgICAg KiBpbnNwZWN0b3IvdW5pdC10ZXN0cy91cmwtdXRpbGl0aWVzLmh0bWw6CisgICAgICAgICogaW5z cGVjdG9yL3VuaXQtdGVzdHMvdXJsLXV0aWxpdGllcy1leHBlY3RlZC50eHQ6CisKIDIwMjAtMDkt MDggIEZyYW5rIFlhbmcgIDxndW93ZWlfeWFuZ0BhcHBsZS5jb20+CiAKICAgICAgICAgQ29yZUlt YWdlIEltcGxlbWVudGF0aW9uIG9mIENTUyBGaWx0ZXJzIGludmVydCgpLCBvcGFjaXR5KCksIGJy aWdodG5lc3MoKSwgY29udHJhc3QoKQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vRE9NVVJM L3VybC1jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMv ZmFzdC9kb20vRE9NVVJML3VybC1jb25zdHJ1Y3Rvci1leHBlY3RlZC50eHQJKHJldmlzaW9uIDI2 NjcwMykKKysrIExheW91dFRlc3RzL2Zhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3ItZXhw ZWN0ZWQudHh0CSh3b3JraW5nIGNvcHkpCkBAIC03LDYgKzcsNyBAQCBPbmUtcGFyYW1ldGVyIGNv bnN0cnVjdG9yIC0gdmFsaWQgVVJMCiBQQVNTIHVybC5ocmVmIGlzICdodHRwOi8vdXNlcjpwYXNz QGV4YW1wbGUuY29tL3BhdGg/cXVlcnkjZnJhZ21lbnQnCiBPbmUtcGFyYW1ldGVyIGNvbnN0cnVj dG9yIC0gaW52YWxpZCBVUkwgc2hvdWxkIHRocm93CiBQQVNTIHVybCA9IG5ldyBVUkwoIiVeJCMi KSB0aHJldyBleGNlcHRpb24gVHlwZUVycm9yOiBUeXBlIGVycm9yLgorUEFTUyB1cmwgPSBuZXcg VVJMKCIjIikgdGhyZXcgZXhjZXB0aW9uIFR5cGVFcnJvcjogVHlwZSBlcnJvci4KIE9uZS1wYXJh bWV0ZXIgY29uc3RydWN0b3IgLSByZWxhdGl2ZSBVUkwgbm90IHZhbGlkIGFnYWluc3QgZGVmYXVs dCBiYXNlCiBQQVNTIHVybCA9IG5ldyBVUkwoImZvb2JhciIpIHRocmV3IGV4Y2VwdGlvbiBUeXBl RXJyb3I6IFR5cGUgZXJyb3IuCiBVUkwgd2l0aCBzdHJpbmcgYmFzZQpJbmRleDogTGF5b3V0VGVz dHMvZmFzdC9kb20vRE9NVVJML3VybC1jb25zdHJ1Y3Rvci5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExh eW91dFRlc3RzL2Zhc3QvZG9tL0RPTVVSTC91cmwtY29uc3RydWN0b3IuaHRtbAkocmV2aXNpb24g MjY2NzAzKQorKysgTGF5b3V0VGVzdHMvZmFzdC9kb20vRE9NVVJML3VybC1jb25zdHJ1Y3Rvci5o dG1sCSh3b3JraW5nIGNvcHkpCkBAIC0xNSw2ICsxNSw3IEBAIHNob3VsZEJlKCJ1cmwuaHJlZiIs ICInaHR0cDovL3VzZXI6cGFzc0AKIAogZGVidWcoIk9uZS1wYXJhbWV0ZXIgY29uc3RydWN0b3Ig LSBpbnZhbGlkIFVSTCBzaG91bGQgdGhyb3ciKTsKIHNob3VsZFRocm93KCd1cmwgPSBuZXcgVVJM KCIlXiQjIiknKTsKK3Nob3VsZFRocm93KCd1cmwgPSBuZXcgVVJMKCIjIiknKTsKIAogZGVidWco Ik9uZS1wYXJhbWV0ZXIgY29uc3RydWN0b3IgLSByZWxhdGl2ZSBVUkwgbm90IHZhbGlkIGFnYWlu c3QgZGVmYXVsdCBiYXNlIik7CiBzaG91bGRUaHJvdygndXJsID0gbmV3IFVSTCgiZm9vYmFyIikn KTsKSW5kZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3VybC11dGlsaXRpZXMt ZXhwZWN0ZWQudHh0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIExheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRl c3RzL3VybC11dGlsaXRpZXMtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAyNjY3MDMpCisrKyBMYXlv dXRUZXN0cy9pbnNwZWN0b3IvdW5pdC10ZXN0cy91cmwtdXRpbGl0aWVzLWV4cGVjdGVkLnR4dAko d29ya2luZyBjb3B5KQpAQCAtNDk5LDcgKzQ5OSw3IEBAIFBBU1M6IFJlbW92aW5nIGZyYWdtZW50 IG9mICdodHRwOi8vZXhhbXAKIFBBU1M6IFJlbW92aW5nIGZyYWdtZW50IG9mICdodHRwOi8vZXhh bXBsZS5jb20vcGF0aC8jJyBzaG91bGQgYmUgJ2h0dHA6Ly9leGFtcGxlLmNvbS9wYXRoLycuCiBQ QVNTOiBSZW1vdmluZyBmcmFnbWVudCBvZiAnaHR0cDovL2V4YW1wbGUuY29tL3BhdGg/Iycgc2hv dWxkIGJlICdodHRwOi8vZXhhbXBsZS5jb20vcGF0aD8nLgogUEFTUzogUmVtb3ZpbmcgZnJhZ21l bnQgb2YgJ2h0dHA6Ly9leGFtcGxlLmNvbS9wYXRoLz8jJyBzaG91bGQgYmUgJ2h0dHA6Ly9leGFt cGxlLmNvbS9wYXRoLz8nLgotUEFTUzogUmVtb3ZpbmcgZnJhZ21lbnQgb2YgJyNoYXNoJyBzaG91 bGQgYmUgJ2Fib3V0OmJsYW5rJy4KK1BBU1M6IFJlbW92aW5nIGZyYWdtZW50IG9mICdhYm91dDpi bGFuayNoYXNoJyBzaG91bGQgYmUgJ2Fib3V0OmJsYW5rJy4KIFBBU1M6IFJlbW92aW5nIGZyYWdt ZW50IG9mICdpbnZhbGlkJyBzaG91bGQgYmUgJ2ludmFsaWQnLgogCiAtLSBSdW5uaW5nIHRlc3Qg Y2FzZTogV0kuaDJBdXRob3JpdHkKSW5kZXg6IExheW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRl c3RzL3VybC11dGlsaXRpZXMuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9pbnNwZWN0 b3IvdW5pdC10ZXN0cy91cmwtdXRpbGl0aWVzLmh0bWwJKHJldmlzaW9uIDI2NjcwMykKKysrIExh eW91dFRlc3RzL2luc3BlY3Rvci91bml0LXRlc3RzL3VybC11dGlsaXRpZXMuaHRtbAkod29ya2lu ZyBjb3B5KQpAQCAtNTczLDcgKzU3Myw3IEBAIGZ1bmN0aW9uIHRlc3QoKQogICAgICAgICAgICAg dGVzdCgiaHR0cDovL2V4YW1wbGUuY29tL3BhdGg/IyIsICJodHRwOi8vZXhhbXBsZS5jb20vcGF0 aD8iKTsKICAgICAgICAgICAgIHRlc3QoImh0dHA6Ly9leGFtcGxlLmNvbS9wYXRoLz8jIiwgImh0 dHA6Ly9leGFtcGxlLmNvbS9wYXRoLz8iKTsKIAotICAgICAgICAgICAgdGVzdCgiI2hhc2giLCAi YWJvdXQ6YmxhbmsiKTsKKyAgICAgICAgICAgIHRlc3QobmV3IFVSTCgiI2hhc2giLCAiYWJvdXQ6 YmxhbmsiKSwgImFib3V0OmJsYW5rIik7CiAgICAgICAgICAgICB0ZXN0KCJpbnZhbGlkIiwgImlu dmFsaWQiKTsKIAogICAgICAgICAgICAgcmV0dXJuIHRydWU7Cg==