163436 2016-10-14 01:55:08 -0700 Document request not updated after willSendRequest is called for a redirect 2016-10-16 01:38:08 -0700 1 1 1 Unclassified WebKit Page Loading WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=146306 P2 Normal --- 163389 1 cgarcia webkit-unassigned beidson bugzilla cdumez commit-queue darin dbates japhet mcatanzaro oldest_to_newest 1240166 0 cgarcia 2016-10-14 01:55:08 -0700 Adding unit tests for bug #146306 in the GTK+ port I've noticed that patch for bug #146306 still doesn't work when a request is modified by willSendRequest after a redirect. The thing is that DocumentLoader::setRequest is not called after willSendRequest is called for a redirect. The first willSendRequest happens before DocumentLoader::startLoadingMainResource, that calls setRequest, but the second one happens after DocumentLoader::redirectReceived() and then the request is never updated again. 1240175 1 291595 cgarcia 2016-10-14 02:02:32 -0700 Created attachment 291595 Patch Added unit tests for GTK+ only, because I'm not sure it's even possible to test a server redirect with the cross-platform C API unit tests. 1240353 2 mcatanzaro 2016-10-14 11:15:22 -0700 (In reply to comment #1) > Created attachment 291595 [details] > Patch > > Added unit tests for GTK+ only, because I'm not sure it's even possible to > test a server redirect with the cross-platform C API unit tests. I think it's not currently possible, because we have no cross-platform equivalent to SoupServer. 1240367 3 291595 mcatanzaro 2016-10-14 11:31:04 -0700 Comment on attachment 291595 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=291595&action=review Great tests. > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:225 > + enum State { Provisional, ProvisionalAfterRedirect, Commited, Finished }; Personally, I'd still favor using enum class even in a file-private unit test class, but your call. > Tools/TestWebKitAPI/Tests/WebKit2Gtk/TestLoaderClient.cpp:254 > + void checkURIAtState(State state, const char* uri) Please rename the second parameter (maybe to "path") because it's not a URI. 1240702 4 cgarcia 2016-10-16 01:38:08 -0700 Committed r207388: <http://trac.webkit.org/changeset/207388> 291595 2016-10-14 02:02:32 -0700 2016-10-14 11:31:04 -0700 Patch wcore-document-request-after-redirect.diff text/plain 12030 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCBhYWFhZWQ2Li41ZDZlYTkwIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIg QEAKKzIwMTYtMTAtMTQgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgorCisgICAgICAgIERvY3VtZW50IHJlcXVlc3Qgbm90IHVwZGF0ZWQgYWZ0ZXIgd2lsbFNlbmRS ZXF1ZXN0IGlzIGNhbGxlZCBmb3IgYSByZWRpcmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYzNDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIGZpcnN0IHdpbGxTZW5kUmVxdWVzdCBoYXBwZW5z IGJlZm9yZSBEb2N1bWVudExvYWRlcjo6c3RhcnRMb2FkaW5nTWFpblJlc291cmNlKCksIHRoYXQg Y2FsbHMgc2V0UmVxdWVzdCwgYnV0CisgICAgICAgIHRoZSBzZWNvbmQgb25lIGhhcHBlbnMgYWZ0 ZXIgRG9jdW1lbnRMb2FkZXI6OnJlZGlyZWN0UmVjZWl2ZWQoKSBhbmQgdGhlbiB0aGUgcmVxdWVz dCBpcyBuZXZlciB1cGRhdGVkIGFnYWluLgorCisgICAgICAgIENvdmVyZWQgYnkgR1RLKyB1bml0 IHRlc3RzLgorCisgICAgICAgICogbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OkRvY3VtZW50TG9hZGVyOjp3aWxsQ29udGludWVNYWluUmVzb3VyY2VMb2FkQWZ0 ZXJSZWRpcmVjdCk6IFNldCB0aGUgbmV3IHJlcXVlc3QuCisgICAgICAgICogbG9hZGVyL0RvY3Vt ZW50TG9hZGVyLmg6CisgICAgICAgICogbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlN1YnJlc291cmNlTG9hZGVyOjp3aWxsU2VuZFJlcXVlc3RJbnRlcm5h bCk6IE5vdGlmeSB0aGUgZG9jdW1lbnQgbG9hZGVyIHdoZW4gbG9hZGluZyB0aGUgbWFpbiByZXNv dXJjZQorICAgICAgICBhbmQgY2FsbGVkIGZvciBhIHJlZGlyZWN0aW9uLgorCiAyMDE2LTEwLTEz ICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBX ZWJWaWV3IGFuZCBXZWJQYWdlIFVSTHMgbm90IHVwZGF0ZWQgYWZ0ZXIgVVJMIGlzIG1vZGlmaWVk IGJ5IEluamVjdGVkQnVuZGxlUGFnZVJlc291cmNlTG9hZENsaWVudDo6d2lsbFNlbmRSZXF1ZXN0 Rm9yRnJhbWUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVudExvYWRl ci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuY3BwCmluZGV4IDFl NzdjZmIuLjlmMTg4NmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9Eb2N1bWVu dExvYWRlci5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmNw cApAQCAtMTYyOSw2ICsxNjI5LDExIEBAIHZvaWQgRG9jdW1lbnRMb2FkZXI6OmNhbmNlbE1haW5S ZXNvdXJjZUxvYWQoY29uc3QgUmVzb3VyY2VFcnJvciYgcmVzb3VyY2VFcnJvcikKICAgICBtYWlu UmVjZWl2ZWRFcnJvcihlcnJvcik7CiB9CiAKK3ZvaWQgRG9jdW1lbnRMb2FkZXI6OndpbGxDb250 aW51ZU1haW5SZXNvdXJjZUxvYWRBZnRlclJlZGlyZWN0KGNvbnN0IFJlc291cmNlUmVxdWVzdCYg bmV3UmVxdWVzdCkKK3sKKyAgICBzZXRSZXF1ZXN0KG5ld1JlcXVlc3QpOworfQorCiB2b2lkIERv Y3VtZW50TG9hZGVyOjpjbGVhck1haW5SZXNvdXJjZSgpCiB7CiAgICAgaWYgKG1fbWFpblJlc291 cmNlICYmIG1fbWFpblJlc291cmNlLT5oYXNDbGllbnQoKnRoaXMpKQpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbG9hZGVyL0RvY3VtZW50TG9hZGVyLmggYi9Tb3VyY2UvV2ViQ29yZS9sb2Fk ZXIvRG9jdW1lbnRMb2FkZXIuaAppbmRleCAxNjIzYmVjLi44OGFkZWJiIDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9sb2FkZXIvRG9jdW1lbnRMb2FkZXIuaApAQCAtMjEzLDcgKzIxMyw4IEBAIG5hbWVzcGFjZSBX ZWJDb3JlIHsKIAogICAgICAgICB2b2lkIHN0YXJ0TG9hZGluZ01haW5SZXNvdXJjZSgpOwogICAg ICAgICBXRUJDT1JFX0VYUE9SVCB2b2lkIGNhbmNlbE1haW5SZXNvdXJjZUxvYWQoY29uc3QgUmVz b3VyY2VFcnJvciYpOwotICAgICAgICAKKyAgICAgICAgdm9pZCB3aWxsQ29udGludWVNYWluUmVz b3VyY2VMb2FkQWZ0ZXJSZWRpcmVjdChjb25zdCBSZXNvdXJjZVJlcXVlc3QmKTsKKwogICAgICAg ICAvLyBTdXBwb3J0IGljb25EYXRhYmFzZSBpbiBzeW5jaHJvbm91cyBtb2RlLgogICAgICAgICB2 b2lkIGljb25Mb2FkRGVjaXNpb25BdmFpbGFibGUoKTsKICAgICAgICAgCmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwIGIvU291cmNlL1dlYkNv cmUvbG9hZGVyL1N1YnJlc291cmNlTG9hZGVyLmNwcAppbmRleCBjNjIxMjkzLi5mYjJiZmRiIDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9sb2FkZXIvU3VicmVzb3VyY2VMb2FkZXIuY3BwCisr KyBiL1NvdXJjZS9XZWJDb3JlL2xvYWRlci9TdWJyZXNvdXJjZUxvYWRlci5jcHAKQEAgLTIyOSw4 ICsyMjksMTMgQEAgdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6d2lsbFNlbmRSZXF1ZXN0SW50ZXJu YWwoUmVzb3VyY2VSZXF1ZXN0JiBuZXdSZXF1ZXN0LCBjb24KICAgICAgICAgcmV0dXJuOwogCiAg ICAgUmVzb3VyY2VMb2FkZXI6OndpbGxTZW5kUmVxdWVzdEludGVybmFsKG5ld1JlcXVlc3QsIHJl ZGlyZWN0UmVzcG9uc2UpOwotICAgIGlmIChuZXdSZXF1ZXN0LmlzTnVsbCgpKQorICAgIGlmIChu ZXdSZXF1ZXN0LmlzTnVsbCgpKSB7CiAgICAgICAgIGNhbmNlbCgpOworICAgICAgICByZXR1cm47 CisgICAgfQorCisgICAgaWYgKG1fcmVzb3VyY2UtPnR5cGUoKSA9PSBDYWNoZWRSZXNvdXJjZTo6 TWFpblJlc291cmNlICYmICFyZWRpcmVjdFJlc3BvbnNlLmlzTnVsbCgpKQorICAgICAgICBtX2Rv Y3VtZW50TG9hZGVyLT53aWxsQ29udGludWVNYWluUmVzb3VyY2VMb2FkQWZ0ZXJSZWRpcmVjdChu ZXdSZXF1ZXN0KTsKIH0KIAogdm9pZCBTdWJyZXNvdXJjZUxvYWRlcjo6ZGlkU2VuZERhdGEodW5z aWduZWQgbG9uZyBsb25nIGJ5dGVzU2VudCwgdW5zaWduZWQgbG9uZyBsb25nIHRvdGFsQnl0ZXNU b0JlU2VudCkKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCBjOTIzNjQ3Li5jNjBjODcyIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIv VG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjEgQEAKKzIwMTYtMTAtMTQgIENhcmxvcyBHYXJj aWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIERvY3VtZW50IHJlcXVl c3Qgbm90IHVwZGF0ZWQgYWZ0ZXIgd2lsbFNlbmRSZXF1ZXN0IGlzIGNhbGxlZCBmb3IgYSByZWRp cmVjdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTYz NDM2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVXBk YXRlIC93ZWJraXQyL1dlYktpdFdlYlZpZXcvYWN0aXZlLXVyaSB0ZXN0IHRvIGNoZWNrIHRoZSBh Y3RpdmUgVVJJIGFsc28gd2hlbiBtb2RpZmllZCBieQorICAgICAgICBXZWJLaXRQYWdlOjpzZW5k LXJlcXVlc3Qgc2lnbmFsIGluIGEgd2ViIGV4dGVuc2lvbi4KKworICAgICAgICAqIFRlc3RXZWJL aXRBUEkvVGVzdHMvV2ViS2l0Mkd0ay9UZXN0TG9hZGVyQ2xpZW50LmNwcDoKKyAgICAgICAgKHRl c3RXZWJWaWV3QWN0aXZlVVJJKToKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToKKyAgICAgICAg KiBUZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0ZW5zaW9uVGVzdC5jcHA6Cisg ICAgICAgIChzZW5kUmVxdWVzdENhbGxiYWNrKToKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL2d0 ay9XZWJLaXQyR3RrL0xvYWRUcmFja2luZ1Rlc3QuY3BwOgorICAgICAgICAobG9hZENoYW5nZWRD YWxsYmFjayk6CisKIDIwMTYtMTAtMTMgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBp Z2FsaWEuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQuIFJlbW92ZWQgbXlzZWxmIGZyb20gQmlu ZGluZ3NTY3JpcHRzIHdhdGNoIGxpc3QuCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdDJHdGsvVGVzdExvYWRlckNsaWVudC5jcHAgYi9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RzL1dlYktpdDJHdGsvVGVzdExvYWRlckNsaWVudC5jcHAKaW5kZXggMjI3YjM4OS4u NWFiYjA2NSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1Rlc3RMb2FkZXJDbGllbnQuY3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Mkd0ay9UZXN0TG9hZGVyQ2xpZW50LmNwcApAQCAtMjcsNiArMjcsNyBAQAogI2luY2x1ZGUg IldlYlZpZXdUZXN0LmgiCiAjaW5jbHVkZSA8Z3RrL2d0ay5oPgogI2luY2x1ZGUgPGxpYnNvdXAv c291cC5oPgorI2luY2x1ZGUgPHd0Zi9WZWN0b3IuaD4KICNpbmNsdWRlIDx3dGYvdGV4dC9DU3Ry aW5nLmg+CiAKIHN0YXRpYyBXZWJLaXRUZXN0QnVzKiBidXM7CkBAIC0yMDksNTEgKzIxMCwxMDAg QEAgcHVibGljOgogCiAgICAgc3RhdGljIHZvaWQgdXJpQ2hhbmdlZChHT2JqZWN0KiwgR1BhcmFt U3BlYyosIFZpZXdVUklUcmFja2luZ1Rlc3QqIHRlc3QpCiAgICAgewotICAgICAgICBnX2Fzc2Vy dF9jbXBzdHIodGVzdC0+bV9hY3RpdmVVUkkuZGF0YSgpLCAhPSwgd2Via2l0X3dlYl92aWV3X2dl dF91cmkodGVzdC0+bV93ZWJWaWV3KSk7Ci0gICAgICAgIHRlc3QtPm1fYWN0aXZlVVJJID0gd2Vi a2l0X3dlYl92aWV3X2dldF91cmkodGVzdC0+bV93ZWJWaWV3KTsKKyAgICAgICAgZ19hc3NlcnRf Y21wc3RyKHRlc3QtPm1fY3VycmVudFVSSS5kYXRhKCksICE9LCB3ZWJraXRfd2ViX3ZpZXdfZ2V0 X3VyaSh0ZXN0LT5tX3dlYlZpZXcpKTsKKyAgICAgICAgdGVzdC0+bV9jdXJyZW50VVJJID0gd2Vi a2l0X3dlYl92aWV3X2dldF91cmkodGVzdC0+bV93ZWJWaWV3KTsKICAgICB9CiAKICAgICBWaWV3 VVJJVHJhY2tpbmdUZXN0KCkKLSAgICAgICAgOiBtX2FjdGl2ZVVSSSh3ZWJraXRfd2ViX3ZpZXdf Z2V0X3VyaShtX3dlYlZpZXcpKQorICAgICAgICA6IG1fY3VycmVudFVSSSh3ZWJraXRfd2ViX3Zp ZXdfZ2V0X3VyaShtX3dlYlZpZXcpKQogICAgIHsKLSAgICAgICAgZ19hc3NlcnQobV9hY3RpdmVV UkkuaXNOdWxsKCkpOworICAgICAgICBnX2Fzc2VydChtX2N1cnJlbnRVUkkuaXNOdWxsKCkpOwor ICAgICAgICBtX2N1cnJlbnRVUklMaXN0Lmdyb3cobV9jdXJyZW50VVJJTGlzdC5jYXBhY2l0eSgp KTsKICAgICAgICAgZ19zaWduYWxfY29ubmVjdChtX3dlYlZpZXcsICJub3RpZnk6OnVyaSIsIEdf Q0FMTEJBQ0sodXJpQ2hhbmdlZCksIHRoaXMpOwogICAgIH0KIAorICAgIGVudW0gU3RhdGUgeyBQ cm92aXNpb25hbCwgUHJvdmlzaW9uYWxBZnRlclJlZGlyZWN0LCBDb21taXRlZCwgRmluaXNoZWQg fTsKKworICAgIHZvaWQgbG9hZFVSSShjb25zdCBjaGFyKiB1cmkpCisgICAgeworICAgICAgICBy ZXNldCgpOworICAgICAgICBMb2FkVHJhY2tpbmdUZXN0Ojpsb2FkVVJJKHVyaSk7CisgICAgfQor CiAgICAgdm9pZCBwcm92aXNpb25hbExvYWRTdGFydGVkKCkKICAgICB7Ci0gICAgICAgIGNoZWNr QWN0aXZlVVJJKCIvcmVkaXJlY3QiKTsKKyAgICAgICAgbV9jdXJyZW50VVJJTGlzdFtQcm92aXNp b25hbF0gPSBtX2N1cnJlbnRVUkk7CiAgICAgfQogCiAgICAgdm9pZCBwcm92aXNpb25hbExvYWRS ZWNlaXZlZFNlcnZlclJlZGlyZWN0KCkKICAgICB7Ci0gICAgICAgIGNoZWNrQWN0aXZlVVJJKCIv bm9ybWFsIik7CisgICAgICAgIG1fY3VycmVudFVSSUxpc3RbUHJvdmlzaW9uYWxBZnRlclJlZGly ZWN0XSA9IG1fY3VycmVudFVSSTsKICAgICB9CiAKICAgICB2b2lkIGxvYWRDb21taXR0ZWQoKQog ICAgIHsKLSAgICAgICAgY2hlY2tBY3RpdmVVUkkoIi9ub3JtYWwiKTsKKyAgICAgICAgbV9jdXJy ZW50VVJJTGlzdFtDb21taXRlZF0gPSBtX2N1cnJlbnRVUkk7CiAgICAgfQogCiAgICAgdm9pZCBs b2FkRmluaXNoZWQoKQogICAgIHsKLSAgICAgICAgY2hlY2tBY3RpdmVVUkkoIi9ub3JtYWwiKTsK KyAgICAgICAgbV9jdXJyZW50VVJJTGlzdFtGaW5pc2hlZF0gPSBtX2N1cnJlbnRVUkk7CiAgICAg ICAgIExvYWRUcmFja2luZ1Rlc3Q6OmxvYWRGaW5pc2hlZCgpOwogICAgIH0KIAotICAgIENTdHJp bmcgbV9hY3RpdmVVUkk7CisgICAgdm9pZCBjaGVja1VSSUF0U3RhdGUoU3RhdGUgc3RhdGUsIGNv bnN0IGNoYXIqIHVyaSkKKyAgICB7CisgICAgICAgIGlmICh1cmkpCisgICAgICAgICAgICBBU1NF UlRfQ01QX0NTVFJJTkcobV9jdXJyZW50VVJJTGlzdFtzdGF0ZV0sID09LCBrU2VydmVyLT5nZXRV UklGb3JQYXRoKHVyaSkpOworICAgICAgICBlbHNlCisgICAgICAgICAgICBnX2Fzc2VydChtX2N1 cnJlbnRVUklMaXN0W3N0YXRlXS5pc051bGwoKSk7CisgICAgfQogCiBwcml2YXRlOgotICAgIHZv aWQgY2hlY2tBY3RpdmVVUkkoY29uc3QgY2hhciogdXJpKQorICAgIHZvaWQgcmVzZXQoKQogICAg IHsKLSAgICAgICAgQVNTRVJUX0NNUF9DU1RSSU5HKG1fYWN0aXZlVVJJLCA9PSwga1NlcnZlci0+ Z2V0VVJJRm9yUGF0aCh1cmkpKTsKKyAgICAgICAgbV9jdXJyZW50VVJJID0gQ1N0cmluZygpOwor ICAgICAgICBtX2N1cnJlbnRVUklMaXN0LmNsZWFyKCk7CisgICAgICAgIG1fY3VycmVudFVSSUxp c3QuZ3JvdyhtX2N1cnJlbnRVUklMaXN0LmNhcGFjaXR5KCkpOwogICAgIH0KKworICAgIENTdHJp bmcgbV9jdXJyZW50VVJJOworICAgIFZlY3RvcjxDU3RyaW5nLCA0PiBtX2N1cnJlbnRVUklMaXN0 OwogfTsKIAogc3RhdGljIHZvaWQgdGVzdFdlYlZpZXdBY3RpdmVVUkkoVmlld1VSSVRyYWNraW5n VGVzdCogdGVzdCwgZ2NvbnN0cG9pbnRlcikKIHsKKyAgICAvLyBOb3JtYWwgbG9hZCwgdGhlIFVS TCBkb2Vzbid0IGNoYW5nZS4KKyAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBh dGgoIi9ub3JtYWwxIikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQo KTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVzdDo6U3RhdGU6 OlByb3Zpc2lvbmFsLCAiL25vcm1hbDEiKTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmll d1VSSVRyYWNraW5nVGVzdDo6U3RhdGU6OlByb3Zpc2lvbmFsQWZ0ZXJSZWRpcmVjdCwgbnVsbHB0 cik7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZpZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRl OjpDb21taXRlZCwgIi9ub3JtYWwxIik7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZpZXdV UklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpGaW5pc2hlZCwgIi9ub3JtYWwxIik7CisKKyAgICAvLyBS ZWRpcmVjdCwgdGhlIFVSTCBjaGFuZ2VzIGFmdGVyIHRoZSByZWRpcmVjdC4KICAgICB0ZXN0LT5s b2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9yZWRpcmVjdCIpLmRhdGEoKSk7CiAgICAg dGVzdC0+d2FpdFVudGlsTG9hZEZpbmlzaGVkKCk7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRl KFZpZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpQcm92aXNpb25hbCwgIi9yZWRpcmVjdCIpOwor ICAgIHRlc3QtPmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0ZTo6UHJv dmlzaW9uYWxBZnRlclJlZGlyZWN0LCAiL25vcm1hbCIpOworICAgIHRlc3QtPmNoZWNrVVJJQXRT dGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0ZTo6Q29tbWl0ZWQsICIvbm9ybWFsIik7Cisg ICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZpZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpGaW5p c2hlZCwgIi9ub3JtYWwiKTsKKworICAgIC8vIE5vcm1hbCBsb2FkLCBVUkwgY2hhbmdlZCBieSBX ZWJLaXRQYWdlOjpzZW5kLXJlcXVlc3QuCisgICAgdGVzdC0+bG9hZFVSSShrU2VydmVyLT5nZXRV UklGb3JQYXRoKCIvbm9ybWFsLWNoYW5nZS1yZXF1ZXN0IikuZGF0YSgpKTsKKyAgICB0ZXN0LT53 YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmlld1VS SVRyYWNraW5nVGVzdDo6U3RhdGU6OlByb3Zpc2lvbmFsLCAiL25vcm1hbC1jaGFuZ2UtcmVxdWVz dCIpOworICAgIHRlc3QtPmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0OjpTdGF0 ZTo6UHJvdmlzaW9uYWxBZnRlclJlZGlyZWN0LCBudWxscHRyKTsKKyAgICB0ZXN0LT5jaGVja1VS SUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVzdDo6U3RhdGU6OkNvbW1pdGVkLCAiL3JlcXVlc3Qt Y2hhbmdlZCIpOworICAgIHRlc3QtPmNoZWNrVVJJQXRTdGF0ZShWaWV3VVJJVHJhY2tpbmdUZXN0 OjpTdGF0ZTo6RmluaXNoZWQsICIvcmVxdWVzdC1jaGFuZ2VkIik7CisKKyAgICAvLyBSZWRpcmVj dCwgVVJMIGNoYW5nZWQgYnkgV2ViS2l0UGFnZTo6c2VuZC1yZXF1ZXN0LgorICAgIHRlc3QtPmxv YWRVUkkoa1NlcnZlci0+Z2V0VVJJRm9yUGF0aCgiL3JlZGlyZWN0LXRvLWNoYW5nZS1yZXF1ZXN0 IikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxMb2FkRmluaXNoZWQoKTsKKyAgICB0ZXN0 LT5jaGVja1VSSUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVzdDo6U3RhdGU6OlByb3Zpc2lvbmFs LCAiL3JlZGlyZWN0LXRvLWNoYW5nZS1yZXF1ZXN0Iik7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0 YXRlKFZpZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpQcm92aXNpb25hbEFmdGVyUmVkaXJlY3Qs ICIvbm9ybWFsLWNoYW5nZS1yZXF1ZXN0Iik7CisgICAgdGVzdC0+Y2hlY2tVUklBdFN0YXRlKFZp ZXdVUklUcmFja2luZ1Rlc3Q6OlN0YXRlOjpDb21taXRlZCwgIi9yZXF1ZXN0LWNoYW5nZWQtb24t cmVkaXJlY3QiKTsKKyAgICB0ZXN0LT5jaGVja1VSSUF0U3RhdGUoVmlld1VSSVRyYWNraW5nVGVz dDo6U3RhdGU6OkZpbmlzaGVkLCAiL3JlcXVlc3QtY2hhbmdlZC1vbi1yZWRpcmVjdCIpOwogfQog CiBjbGFzcyBWaWV3SXNMb2FkaW5nVGVzdDogcHVibGljIExvYWRUcmFja2luZ1Rlc3QgewpAQCAt NDg0LDYgKzUzNCw5IEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxiYWNrKFNvdXBTZXJ2ZXIqIHNl cnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIqCiAgICAgZWxzZSBpZiAoZ19z dHJfZXF1YWwocGF0aCwgIi9yZWRpcmVjdCIpKSB7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRf c3RhdHVzKG1lc3NhZ2UsIFNPVVBfU1RBVFVTX01PVkVEX1BFUk1BTkVOVExZKTsKICAgICAgICAg c291cF9tZXNzYWdlX2hlYWRlcnNfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsICJM b2NhdGlvbiIsICIvbm9ybWFsIik7CisgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAi L3JlZGlyZWN0LXRvLWNoYW5nZS1yZXF1ZXN0IikpIHsKKyAgICAgICAgc291cF9tZXNzYWdlX3Nl dF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTU9WRURfUEVSTUFORU5UTFkpOworICAgICAg ICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQobWVzc2FnZS0+cmVzcG9uc2VfaGVhZGVycywg IkxvY2F0aW9uIiwgIi9ub3JtYWwtY2hhbmdlLXJlcXVlc3QiKTsKICAgICB9IGVsc2UgaWYgKGdf c3RyX2VxdWFsKHBhdGgsICIvY2FuY2VsbGVkIikpIHsKICAgICAgICAgc291cF9tZXNzYWdlX2hl YWRlcnNfc2V0X2VuY29kaW5nKG1lc3NhZ2UtPnJlc3BvbnNlX2hlYWRlcnMsIFNPVVBfRU5DT0RJ TkdfQ0hVTktFRCk7CiAgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5y ZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIHJlc3BvbnNlU3RyaW5nLCBzdHJsZW4o cmVzcG9uc2VTdHJpbmcpKTsKZGlmZiAtLWdpdCBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMv V2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVz dHMvV2ViS2l0Mkd0ay9XZWJFeHRlbnNpb25UZXN0LmNwcAppbmRleCA0ZTQwMjUxLi5mZTZmZmNh IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYktpdDJHdGsvV2ViRXh0 ZW5zaW9uVGVzdC5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXQyR3Rr L1dlYkV4dGVuc2lvblRlc3QuY3BwCkBAIC0xNTQsNiArMTU0LDEwIEBAIHN0YXRpYyBnYm9vbGVh biBzZW5kUmVxdWVzdENhbGxiYWNrKFdlYktpdFdlYlBhZ2UqLCBXZWJLaXRVUklSZXF1ZXN0KiBy ZXF1ZXN0LCBXCiAgICAgICAgIFNvdXBNZXNzYWdlSGVhZGVycyogaGVhZGVycyA9IHdlYmtpdF91 cmlfcmVxdWVzdF9nZXRfaHR0cF9oZWFkZXJzKHJlcXVlc3QpOwogICAgICAgICBnX2Fzc2VydCho ZWFkZXJzKTsKICAgICAgICAgc291cF9tZXNzYWdlX2hlYWRlcnNfYXBwZW5kKGhlYWRlcnMsICJE TlQiLCAiMSIpOworICAgIH0gZWxzZSBpZiAoZ19zdHJfaGFzX3N1ZmZpeChyZXF1ZXN0VVJJLCAi L25vcm1hbC1jaGFuZ2UtcmVxdWVzdCIpKSB7CisgICAgICAgIEdVbmlxdWVQdHI8Y2hhcj4gcHJl Zml4KGdfc3RybmR1cChyZXF1ZXN0VVJJLCBzdHJsZW4ocmVxdWVzdFVSSSkgLSBzdHJsZW4oIi9u b3JtYWwtY2hhbmdlLXJlcXVlc3QiKSkpOworICAgICAgICBHVW5pcXVlUHRyPGNoYXI+IG5ld1VS SShnX3N0cmR1cF9wcmludGYoIiVzL3JlcXVlc3QtY2hhbmdlZCVzIiwgcHJlZml4LmdldCgpLCBy ZWRpcmVjdFJlc3BvbnNlID8gIi1vbi1yZWRpcmVjdCIgOiAiIikpOworICAgICAgICB3ZWJraXRf dXJpX3JlcXVlc3Rfc2V0X3VyaShyZXF1ZXN0LCBuZXdVUkkuZ2V0KCkpOwogICAgIH0gZWxzZSBp ZiAoZ19zdHJfaGFzX3N1ZmZpeChyZXF1ZXN0VVJJLCAiL2h0dHAtZ2V0LW1ldGhvZCIpKSB7CiAg ICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X2h0dHBfbWV0aG9k KHJlcXVlc3QpLCA9PSwgIkdFVCIpOwogICAgICAgICBnX2Fzc2VydCh3ZWJraXRfdXJpX3JlcXVl c3RfZ2V0X2h0dHBfbWV0aG9kKHJlcXVlc3QpID09IFNPVVBfTUVUSE9EX0dFVCk7CmRpZmYgLS1n aXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL2d0ay9XZWJLaXQyR3RrL0xvYWRUcmFja2luZ1Rlc3Qu Y3BwIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9ndGsvV2ViS2l0Mkd0ay9Mb2FkVHJhY2tpbmdUZXN0 LmNwcAppbmRleCBlNzhjZTQ1Li40YTI2MGI4IDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL2d0ay9XZWJLaXQyR3RrL0xvYWRUcmFja2luZ1Rlc3QuY3BwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvZ3RrL1dlYktpdDJHdGsvTG9hZFRyYWNraW5nVGVzdC5jcHAKQEAgLTM5LDcgKzM5 LDcgQEAgc3RhdGljIHZvaWQgbG9hZENoYW5nZWRDYWxsYmFjayhXZWJLaXRXZWJWaWV3KiB3ZWJW aWV3LCBXZWJLaXRMb2FkRXZlbnQgbG9hZEV2ZW4KICAgICAgICAgYnJlYWs7CiAgICAgY2FzZSBX RUJLSVRfTE9BRF9DT01NSVRURUQ6IHsKICAgICAgICAgZ19hc3NlcnQod2Via2l0X3dlYl92aWV3 X2lzX2xvYWRpbmcod2ViVmlldykpOwotICAgICAgICBnX2Fzc2VydF9jbXBzdHIodGVzdC0+bV9h Y3RpdmVVUkkuZGF0YSgpLCA9PSwgd2Via2l0X3dlYl92aWV3X2dldF91cmkod2ViVmlldykpOwor ICAgICAgICB0ZXN0LT5tX2FjdGl2ZVVSSSA9IHdlYmtpdF93ZWJfdmlld19nZXRfdXJpKHdlYlZp ZXcpOwogCiAgICAgICAgIC8vIENoZWNrIHRoYXQgb24gY29tbWl0dGVkIHdlIGFsd2F5cyBoYXZl IGEgbWFpbiByZXNvdXJjZSB3aXRoIGEgcmVzcG9uc2UuCiAgICAgICAgIFdlYktpdFdlYlJlc291 cmNlKiByZXNvdXJjZSA9IHdlYmtpdF93ZWJfdmlld19nZXRfbWFpbl9yZXNvdXJjZSh3ZWJWaWV3 KTsK