231401 2021-10-07 16:48:05 -0700 WebKitTestRunner should check mainFrameURL exists in InjectedBundlePage::willSendRequestForFrame 2021-10-12 14:59:19 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 gnavamarino webkit-unassigned achristensen ap beidson cdumez jbedard simon.fraser webkit-bug-importer wenson_hsieh youennf oldest_to_newest 1801871 0 gnavamarino 2021-10-07 16:48:05 -0700 In some cases the provisionalDocumentLoader will not be there (i.e. when DocumentLoader::startLoadingMainResource: Returning empty document"), so the returned value of WKBundleFrameCopyProvisionalURL will not be valid. 1801872 1 440556 gnavamarino 2021-10-07 16:57:02 -0700 Created attachment 440556 Patch 1802053 2 440556 youennf 2021-10-08 07:52:56 -0700 Comment on attachment 440556 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440556&action=review > LayoutTests/fast/harness/testrunner-fetch-empty-document.html:4 > + testRunner.dumpAsText(); Test is failing on Mac debug wk1 as well, this is worth checking. I also tried the test locally on mock-wk2-debug and it is passing without the patch. 1802247 3 gnavamarino 2021-10-08 14:21:10 -0700 (In reply to youenn fablet from comment #2) > Comment on attachment 440556 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=440556&action=review > > > LayoutTests/fast/harness/testrunner-fetch-empty-document.html:4 > > + testRunner.dumpAsText(); > > Test is failing on Mac debug wk1 as well, this is worth checking. > I also tried the test locally on mock-wk2-debug and it is passing without > the patch. This issue is only reproducible when the test is loaded from an http server AND the URL path is not 127.0.0.1/localhost. Unfortunately the test runner uses 127.0.0.1 so we cannot simply move this test to the http folder under LayoutTests. 1802249 4 440672 gnavamarino 2021-10-08 14:27:01 -0700 Created attachment 440672 Patch 1803014 5 440672 youennf 2021-10-12 00:46:51 -0700 Comment on attachment 440672 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=440672&action=review > Tools/ChangeLog:9 > + (WTR::InjectedBundlePage::willSendRequestForFrame): Let's add a comment explaining the case for this check: Add mainFrameURL check in case of loading a non localhost URL with WebKitTestRunner. 1803174 6 440948 gnavamarino 2021-10-12 09:29:25 -0700 Created attachment 440948 Patch 1803208 7 youennf 2021-10-12 10:24:59 -0700 Please put cq? if you want me to cq+ it 1803394 8 gnavamarino 2021-10-12 14:29:35 -0700 (In reply to youenn fablet from comment #7) > Please put cq? if you want me to cq+ it Added! Thank you for the head's up. 1803430 9 ews-feeder 2021-10-12 14:58:16 -0700 Committed r284039 (242869@main): <https://commits.webkit.org/242869@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 440948. 1803433 10 webkit-bug-importer 2021-10-12 14:59:19 -0700 <rdar://problem/84167947> 440556 2021-10-07 16:57:02 -0700 2021-10-08 14:27:26 -0700 Patch bug-231401-20211007165701.patch text/plain 3923 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDdkMWZkYzU4OTM5Y2E1NzA1ZTE3ZjhmOTI4M2U1MDI5 NzViZjYzOS4uZWE2MmE5ZTY5MzYwNjYzZjJlMjQ5OGNiMWIzZjI3NjMxODQ0OTg4YyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTEwLTA3ICBHYWJyaWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgc2hvdWxkIGNoZWNrIG1haW5GcmFtZVVS TCBleGlzdHMgaW4gSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAxIAor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0 VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwOgorICAgICAg ICAoV1RSOjpJbmplY3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lKToKKwog MjAyMS0xMC0wNiAgUGhpbGlwIENoaW1lbnRvICA8cGNoaW1lbnRvQGlnYWxpYS5jb20+CiAKICAg ICAgICAgU3R5bGUgY2hlY2tlciBzaG91bGQgY2hlY2sgc3BhY2luZyBpbnNpZGUgYnJhY2VzIHdp dGggZWxlbWVudHMgaW4gdGhlbQpkaWZmIC0tZ2l0IGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9J bmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwIGIvVG9vbHMvV2ViS2l0VGVzdFJ1 bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCmluZGV4IGRmZjUwZWRm ZjY2ZWQ5ODhjMGYyZTY5M2M2MjVlZmRmMjA1OWIyMDYuLjNjNzQxMjdjZmJlMGRhNDYzZjcxY2E2 MDBhNWNhYzMwODY2YmY0YTIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5q ZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcAorKysgYi9Ub29scy9XZWJLaXRUZXN0 UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKQEAgLTEwNTYsMTAg KzEwNTYsMTEgQEAgV0tVUkxSZXF1ZXN0UmVmIEluamVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRS ZXF1ZXN0Rm9yRnJhbWUoV0tCdW5kbGVQYWdlUmVmIHBhZ2UKICAgICAgICAgICAgIGF1dG8gbWFp bkZyYW1lVVJMID0gYWRvcHRXSyhXS0J1bmRsZUZyYW1lQ29weVVSTChtYWluRnJhbWUpKTsKICAg ICAgICAgICAgIGlmICghbWFpbkZyYW1lVVJMIHx8IFdLU3RyaW5nSXNFcXVhbFRvVVRGOENTdHJp bmcoYWRvcHRXSyhXS1VSTENvcHlTdHJpbmcobWFpbkZyYW1lVVJMLmdldCgpKSkuZ2V0KCksICJh Ym91dDpibGFuayIpKQogICAgICAgICAgICAgICAgIG1haW5GcmFtZVVSTCA9IGFkb3B0V0soV0tC dW5kbGVGcmFtZUNvcHlQcm92aXNpb25hbFVSTChtYWluRnJhbWUpKTsKLQotICAgICAgICAgICAg YXV0byBtYWluRnJhbWVIb3N0ID0gYWRvcHRXSyhXS1VSTENvcHlIb3N0TmFtZShtYWluRnJhbWVV UkwuZ2V0KCkpKTsKLSAgICAgICAgICAgIGF1dG8gbWFpbkZyYW1lU2NoZW1lID0gYWRvcHRXSyhX S1VSTENvcHlTY2hlbWUobWFpbkZyYW1lVVJMLmdldCgpKSk7Ci0gICAgICAgICAgICBtYWluRnJh bWVJc0V4dGVybmFsID0gaXNIVFRQT3JIVFRQU1NjaGVtZShtYWluRnJhbWVTY2hlbWUuZ2V0KCkp ICYmICFpc0xvY2FsSG9zdChtYWluRnJhbWVIb3N0LmdldCgpKTsKKyAgICAgICAgICAgIGlmICht YWluRnJhbWVVUkwpIHsKKyAgICAgICAgICAgICAgICBhdXRvIG1haW5GcmFtZUhvc3QgPSBhZG9w dFdLKFdLVVJMQ29weUhvc3ROYW1lKG1haW5GcmFtZVVSTC5nZXQoKSkpOworICAgICAgICAgICAg ICAgIGF1dG8gbWFpbkZyYW1lU2NoZW1lID0gYWRvcHRXSyhXS1VSTENvcHlTY2hlbWUobWFpbkZy YW1lVVJMLmdldCgpKSk7CisgICAgICAgICAgICAgICAgbWFpbkZyYW1lSXNFeHRlcm5hbCA9IGlz SFRUUE9ySFRUUFNTY2hlbWUobWFpbkZyYW1lU2NoZW1lLmdldCgpKSAmJiAhaXNMb2NhbEhvc3Qo bWFpbkZyYW1lSG9zdC5nZXQoKSk7CisgICAgICAgICAgICB9CiAgICAgICAgIH0KICAgICAgICAg aWYgKCFtYWluRnJhbWVJc0V4dGVybmFsICYmICFpc0FsbG93ZWRIb3N0KGhvc3QuZ2V0KCkpKSB7 CiAgICAgICAgICAgICBpbmplY3RlZEJ1bmRsZS5vdXRwdXRUZXh0KG1ha2VTdHJpbmcoIkJsb2Nr ZWQgYWNjZXNzIHRvIGV4dGVybmFsIFVSTCAiLCB1cmxTdHJpbmcuZ2V0KCksICdcbicpKTsKZGlm ZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxvZwpp bmRleCAzMjA0NmE2ZWFjMmQwNWVjNTY2NmMyNjc4NmJhMzlkMzVmODQxMTE1Li44ZWFjMTk1Mjkz YmUxNzM1Y2IwYWQ1NjZmMDgwNTRkZmNjNjEwNDgzIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIw MjEtMTAtMDcgIEdhYnJpZWwgTmF2YSBNYXJpbm8gIDxnbmF2YW1hcmlub0BhcHBsZS5jb20+CisK KyAgICAgICAgV2ViS2l0VGVzdFJ1bm5lciBzaG91bGQgY2hlY2sgbWFpbkZyYW1lVVJMIGV4aXN0 cyBpbiBJbmplY3RlZEJ1bmRsZVBhZ2U6OndpbGxTZW5kUmVxdWVzdEZvckZyYW1lIAorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAxIAorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogZmFzdC9oYXJuZXNz L3Rlc3RydW5uZXItZmV0Y2gtZW1wdHktZG9jdW1lbnQtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAg ICAgICAgKiBmYXN0L2hhcm5lc3MvdGVzdHJ1bm5lci1mZXRjaC1lbXB0eS1kb2N1bWVudC5odG1s OiBBZGRlZC4KKwogMjAyMS0xMC0wNiAgQXl1bWkgS29qaW1hICA8YXl1bWlfa29qaW1hQGFwcGxl LmNvbT4KIAogICAgICAgICBtZWRpYS9tb2Rlcm4tbWVkaWEtY29udHJvbHMgdGVzdHMgYXJlIHRp bWluZyBvdXQuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9mYXN0L2hhcm5lc3MvdGVzdHJ1bm5l ci1mZXRjaC1lbXB0eS1kb2N1bWVudC1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9mYXN0L2hh cm5lc3MvdGVzdHJ1bm5lci1mZXRjaC1lbXB0eS1kb2N1bWVudC1leHBlY3RlZC50eHQKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uN2VmMjJlOWE0MzFhZDAyNzI3MTNiNzFmZGM4Nzk0MDE2YzhlZjEyZgotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2Zhc3QvaGFybmVzcy90ZXN0cnVubmVyLWZldGNoLWVtcHR5 LWRvY3VtZW50LWV4cGVjdGVkLnR4dApAQCAtMCwwICsxIEBACitQQVNTCmRpZmYgLS1naXQgYS9M YXlvdXRUZXN0cy9mYXN0L2hhcm5lc3MvdGVzdHJ1bm5lci1mZXRjaC1lbXB0eS1kb2N1bWVudC5o dG1sIGIvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Rlc3RydW5uZXItZmV0Y2gtZW1wdHktZG9j dW1lbnQuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5kYzBkNjJiM2I4N2ZlZWJkOTQwZDUwMGFjMzM5NGUyYTcy Y2IyMTUwCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvZmFzdC9oYXJuZXNzL3Rlc3Ry dW5uZXItZmV0Y2gtZW1wdHktZG9jdW1lbnQuaHRtbApAQCAtMCwwICsxLDcgQEAKKzxzY3JpcHQ+ CisgIG9wZW4oKS5mZXRjaCgnJyk7CisgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikgeworICAgICAg dGVzdFJ1bm5lci5kdW1wQXNUZXh0KCk7CisgIH0KKzwvc2NyaXB0PgorUEFTUwo= 440672 2021-10-08 14:27:01 -0700 2021-10-12 09:29:20 -0700 Patch bug-231401-20211008142700.patch text/plain 2333 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDdkMWZkYzU4OTM5Y2E1NzA1ZTE3ZjhmOTI4M2U1MDI5 NzViZjYzOS4uYmJjNDQ0YWNhMDVhOWZhZDRjNzYwM2I5NjFmMDk4MGEwY2U3MmRlNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEz IEBACisyMDIxLTEwLTA4ICBHYWJyaWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgc2hvdWxkIGNoZWNrIG1haW5GcmFtZVVS TCBleGlzdHMgaW4gSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJLaXRU ZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHA6CisgICAgICAg IChXVFI6OkluamVjdGVkQnVuZGxlUGFnZTo6d2lsbFNlbmRSZXF1ZXN0Rm9yRnJhbWUpOgorCiAy MDIxLTEwLTA2ICBQaGlsaXAgQ2hpbWVudG8gIDxwY2hpbWVudG9AaWdhbGlhLmNvbT4KIAogICAg ICAgICBTdHlsZSBjaGVja2VyIHNob3VsZCBjaGVjayBzcGFjaW5nIGluc2lkZSBicmFjZXMgd2l0 aCBlbGVtZW50cyBpbiB0aGVtCmRpZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0lu amVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVu bmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVkQnVuZGxlUGFnZS5jcHAKaW5kZXggZGZmNTBlZGZm NjZlZDk4OGMwZjJlNjkzYzYyNWVmZGYyMDU5YjIwNi4uM2M3NDEyN2NmYmUwZGE0NjNmNzFjYTYw MGE1Y2FjMzA4NjZiZjRhMiAxMDA2NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9Jbmpl Y3RlZEJ1bmRsZS9JbmplY3RlZEJ1bmRsZVBhZ2UuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RS dW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcApAQCAtMTA1NiwxMCAr MTA1NiwxMSBAQCBXS1VSTFJlcXVlc3RSZWYgSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJl cXVlc3RGb3JGcmFtZShXS0J1bmRsZVBhZ2VSZWYgcGFnZQogICAgICAgICAgICAgYXV0byBtYWlu RnJhbWVVUkwgPSBhZG9wdFdLKFdLQnVuZGxlRnJhbWVDb3B5VVJMKG1haW5GcmFtZSkpOwogICAg ICAgICAgICAgaWYgKCFtYWluRnJhbWVVUkwgfHwgV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmlu ZyhhZG9wdFdLKFdLVVJMQ29weVN0cmluZyhtYWluRnJhbWVVUkwuZ2V0KCkpKS5nZXQoKSwgImFi b3V0OmJsYW5rIikpCiAgICAgICAgICAgICAgICAgbWFpbkZyYW1lVVJMID0gYWRvcHRXSyhXS0J1 bmRsZUZyYW1lQ29weVByb3Zpc2lvbmFsVVJMKG1haW5GcmFtZSkpOwotCi0gICAgICAgICAgICBh dXRvIG1haW5GcmFtZUhvc3QgPSBhZG9wdFdLKFdLVVJMQ29weUhvc3ROYW1lKG1haW5GcmFtZVVS TC5nZXQoKSkpOwotICAgICAgICAgICAgYXV0byBtYWluRnJhbWVTY2hlbWUgPSBhZG9wdFdLKFdL VVJMQ29weVNjaGVtZShtYWluRnJhbWVVUkwuZ2V0KCkpKTsKLSAgICAgICAgICAgIG1haW5GcmFt ZUlzRXh0ZXJuYWwgPSBpc0hUVFBPckhUVFBTU2NoZW1lKG1haW5GcmFtZVNjaGVtZS5nZXQoKSkg JiYgIWlzTG9jYWxIb3N0KG1haW5GcmFtZUhvc3QuZ2V0KCkpOworICAgICAgICAgICAgaWYgKG1h aW5GcmFtZVVSTCkgeworICAgICAgICAgICAgICAgIGF1dG8gbWFpbkZyYW1lSG9zdCA9IGFkb3B0 V0soV0tVUkxDb3B5SG9zdE5hbWUobWFpbkZyYW1lVVJMLmdldCgpKSk7CisgICAgICAgICAgICAg ICAgYXV0byBtYWluRnJhbWVTY2hlbWUgPSBhZG9wdFdLKFdLVVJMQ29weVNjaGVtZShtYWluRnJh bWVVUkwuZ2V0KCkpKTsKKyAgICAgICAgICAgICAgICBtYWluRnJhbWVJc0V4dGVybmFsID0gaXNI VFRQT3JIVFRQU1NjaGVtZShtYWluRnJhbWVTY2hlbWUuZ2V0KCkpICYmICFpc0xvY2FsSG9zdCht YWluRnJhbWVIb3N0LmdldCgpKTsKKyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBp ZiAoIW1haW5GcmFtZUlzRXh0ZXJuYWwgJiYgIWlzQWxsb3dlZEhvc3QoaG9zdC5nZXQoKSkpIHsK ICAgICAgICAgICAgIGluamVjdGVkQnVuZGxlLm91dHB1dFRleHQobWFrZVN0cmluZygiQmxvY2tl ZCBhY2Nlc3MgdG8gZXh0ZXJuYWwgVVJMICIsIHVybFN0cmluZy5nZXQoKSwgJ1xuJykpOwo= 440948 2021-10-12 09:29:25 -0700 2021-10-12 14:58:18 -0700 Patch bug-231401-20211012092924.patch text/plain 2426 gnavamarino U3VidmVyc2lvbiBSZXZpc2lvbjogMjgzNjMwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZDdkMWZkYzU4OTM5Y2E1NzA1ZTE3ZjhmOTI4M2U1MDI5 NzViZjYzOS4uN2M1MDRhNGFmYWI3MzUzMTdiNTM3YjU4YmNkMDFlMzk2MTEwNmUwMyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE0 IEBACisyMDIxLTEwLTA4ICBHYWJyaWVsIE5hdmEgTWFyaW5vICA8Z25hdmFtYXJpbm9AYXBwbGUu Y29tPgorCisgICAgICAgIFdlYktpdFRlc3RSdW5uZXIgc2hvdWxkIGNoZWNrIG1haW5GcmFtZVVS TCBleGlzdHMgaW4gSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjMxNDAxCisK KyAgICAgICAgUmV2aWV3ZWQgYnkgWW91ZW5uIEZhYmxldC4KKworICAgICAgICAqIFdlYktpdFRl c3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUvSW5qZWN0ZWRCdW5kbGVQYWdlLmNwcDoKKyAgICAgICAg KFdUUjo6SW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZSk6CisgICAg ICAgIEFkZCBtYWluRnJhbWVVUkwgY2hlY2sgaW4gY2FzZSBvZiBsb2FkaW5nIGEgbm9uIGxvY2Fs aG9zdCBVUkwgd2l0aCBXZWJLaXRUZXN0UnVubmVyLgorCiAyMDIxLTEwLTA2ICBQaGlsaXAgQ2hp bWVudG8gIDxwY2hpbWVudG9AaWdhbGlhLmNvbT4KIAogICAgICAgICBTdHlsZSBjaGVja2VyIHNo b3VsZCBjaGVjayBzcGFjaW5nIGluc2lkZSBicmFjZXMgd2l0aCBlbGVtZW50cyBpbiB0aGVtCmRp ZmYgLS1naXQgYS9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0luamVjdGVk QnVuZGxlUGFnZS5jcHAgYi9Ub29scy9XZWJLaXRUZXN0UnVubmVyL0luamVjdGVkQnVuZGxlL0lu amVjdGVkQnVuZGxlUGFnZS5jcHAKaW5kZXggZGZmNTBlZGZmNjZlZDk4OGMwZjJlNjkzYzYyNWVm ZGYyMDU5YjIwNi4uM2M3NDEyN2NmYmUwZGE0NjNmNzFjYTYwMGE1Y2FjMzA4NjZiZjRhMiAxMDA2 NDQKLS0tIGEvVG9vbHMvV2ViS2l0VGVzdFJ1bm5lci9JbmplY3RlZEJ1bmRsZS9JbmplY3RlZEJ1 bmRsZVBhZ2UuY3BwCisrKyBiL1Rvb2xzL1dlYktpdFRlc3RSdW5uZXIvSW5qZWN0ZWRCdW5kbGUv SW5qZWN0ZWRCdW5kbGVQYWdlLmNwcApAQCAtMTA1NiwxMCArMTA1NiwxMSBAQCBXS1VSTFJlcXVl c3RSZWYgSW5qZWN0ZWRCdW5kbGVQYWdlOjp3aWxsU2VuZFJlcXVlc3RGb3JGcmFtZShXS0J1bmRs ZVBhZ2VSZWYgcGFnZQogICAgICAgICAgICAgYXV0byBtYWluRnJhbWVVUkwgPSBhZG9wdFdLKFdL QnVuZGxlRnJhbWVDb3B5VVJMKG1haW5GcmFtZSkpOwogICAgICAgICAgICAgaWYgKCFtYWluRnJh bWVVUkwgfHwgV0tTdHJpbmdJc0VxdWFsVG9VVEY4Q1N0cmluZyhhZG9wdFdLKFdLVVJMQ29weVN0 cmluZyhtYWluRnJhbWVVUkwuZ2V0KCkpKS5nZXQoKSwgImFib3V0OmJsYW5rIikpCiAgICAgICAg ICAgICAgICAgbWFpbkZyYW1lVVJMID0gYWRvcHRXSyhXS0J1bmRsZUZyYW1lQ29weVByb3Zpc2lv bmFsVVJMKG1haW5GcmFtZSkpOwotCi0gICAgICAgICAgICBhdXRvIG1haW5GcmFtZUhvc3QgPSBh ZG9wdFdLKFdLVVJMQ29weUhvc3ROYW1lKG1haW5GcmFtZVVSTC5nZXQoKSkpOwotICAgICAgICAg ICAgYXV0byBtYWluRnJhbWVTY2hlbWUgPSBhZG9wdFdLKFdLVVJMQ29weVNjaGVtZShtYWluRnJh bWVVUkwuZ2V0KCkpKTsKLSAgICAgICAgICAgIG1haW5GcmFtZUlzRXh0ZXJuYWwgPSBpc0hUVFBP ckhUVFBTU2NoZW1lKG1haW5GcmFtZVNjaGVtZS5nZXQoKSkgJiYgIWlzTG9jYWxIb3N0KG1haW5G cmFtZUhvc3QuZ2V0KCkpOworICAgICAgICAgICAgaWYgKG1haW5GcmFtZVVSTCkgeworICAgICAg ICAgICAgICAgIGF1dG8gbWFpbkZyYW1lSG9zdCA9IGFkb3B0V0soV0tVUkxDb3B5SG9zdE5hbWUo bWFpbkZyYW1lVVJMLmdldCgpKSk7CisgICAgICAgICAgICAgICAgYXV0byBtYWluRnJhbWVTY2hl bWUgPSBhZG9wdFdLKFdLVVJMQ29weVNjaGVtZShtYWluRnJhbWVVUkwuZ2V0KCkpKTsKKyAgICAg ICAgICAgICAgICBtYWluRnJhbWVJc0V4dGVybmFsID0gaXNIVFRQT3JIVFRQU1NjaGVtZShtYWlu RnJhbWVTY2hlbWUuZ2V0KCkpICYmICFpc0xvY2FsSG9zdChtYWluRnJhbWVIb3N0LmdldCgpKTsK KyAgICAgICAgICAgIH0KICAgICAgICAgfQogICAgICAgICBpZiAoIW1haW5GcmFtZUlzRXh0ZXJu YWwgJiYgIWlzQWxsb3dlZEhvc3QoaG9zdC5nZXQoKSkpIHsKICAgICAgICAgICAgIGluamVjdGVk QnVuZGxlLm91dHB1dFRleHQobWFrZVN0cmluZygiQmxvY2tlZCBhY2Nlc3MgdG8gZXh0ZXJuYWwg VVJMICIsIHVybFN0cmluZy5nZXQoKSwgJ1xuJykpOwo=