126290 2013-12-30 08:01:40 -0800 [SOUP] willSendRequest doesn't work after a redirect 2013-12-31 00:24:45 -0800 1 1 1 Unclassified WebKit Platform 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED Soup P2 Normal --- 126291 1 cgarcia webkit-unassigned cdumez commit-queue danw gustavo mrobinson rakuco svillar oldest_to_newest 963319 0 cgarcia 2013-12-30 08:01:40 -0800 The problem is that we are creating the new soup request for the redirect before calling ResourceHandleClient::willSendRequest() so that any change made to the request by the client is ignored. 963320 1 220109 cgarcia 2013-12-30 08:06:16 -0800 Created attachment 220109 Patch 963321 2 commit-queue 2013-12-30 08:08:15 -0800 Thanks for the patch. If this patch contains new public API please make sure it follows the guidelines for new WebKit2 GTK+ API. See http://trac.webkit.org/wiki/WebKitGTK/AddingNewWebKit2API 963489 3 cgarcia 2013-12-31 00:24:45 -0800 Committed r161176: <http://trac.webkit.org/changeset/161176> 220109 2013-12-30 08:06:16 -0800 2013-12-30 11:25:16 -0800 Patch wk-soup-send-request-redirect.diff text/plain 8924 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYjBiYjYwLi5jNDAwOWUzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29y ZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDUgKzEsMjEg QEAKIDIwMTMtMTItMzAgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29t PgogCisgICAgICAgIFtTT1VQXSB3aWxsU2VuZFJlcXVlc3QgZG9lc24ndCB3b3JrIGFmdGVyIGEg cmVkaXJlY3QKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTEyNjI5MAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IFRoZSBwcm9ibGVtIGlzIHRoYXQgd2UgYXJlIGNyZWF0aW5nIHRoZSBuZXcgc291cCByZXF1ZXN0 IGZvciB0aGUKKyAgICAgICAgcmVkaXJlY3QgYmVmb3JlIGNhbGxpbmcgUmVzb3VyY2VIYW5kbGVD bGllbnQ6OndpbGxTZW5kUmVxdWVzdCgpIHNvCisgICAgICAgIHRoYXQgYW55IGNoYW5nZSBtYWRl IHRvIHRoZSByZXF1ZXN0IGJ5IHRoZSBjbGllbnQgaXMgaWdub3JlZC4KKworICAgICAgICAqIHBs YXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwOgorICAgICAgICAoV2Vi Q29yZTo6ZG9SZWRpcmVjdCk6IENyZWF0ZSB0aGUgbmV3IHNvdXAgcmVxdWVzdCBhbmQgc291cAor ICAgICAgICBtZXNzYWdlIGZvciB0aGUgcmVkaXJlY3QgYWZ0ZXIgY2FsbGluZyB3aWxsU2VuZFJl cXVlc3QoKSBvbiB0aGUKKyAgICAgICAgY2xpZW50LgorCisyMDEzLTEyLTMwICBDYXJsb3MgR2Fy Y2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwogICAgICAgICBbU09VUF0gUmV0dXJu IGVhcmx5IGluIFJlc291cmNlSGFuZGxlOjpyZWNlaXZlZENhbmNlbGxhdGlvbiBpZiB0aGUgbG9h ZCBoYXMgYWxyZWFkeSBjYW5jZWxsZWQKICAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTEyNjI4NwogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9uZXR3b3JrL3NvdXAvUmVzb3VyY2VIYW5kbGVTb3VwLmNwcCBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCmluZGV4IGUzZWM3 YjkuLjczZWM5MDYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL25ldHdvcmsv c291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L25ldHdvcmsvc291cC9SZXNvdXJjZUhhbmRsZVNvdXAuY3BwCkBAIC01MDIsMTIgKzUwMiw2IEBA IHN0YXRpYyB2b2lkIGRvUmVkaXJlY3QoUmVzb3VyY2VIYW5kbGUqIGhhbmRsZSkKICAgICB9IGVs c2UKICAgICAgICAgYXBwbHlBdXRoZW50aWNhdGlvblRvUmVxdWVzdChoYW5kbGUsIG5ld1JlcXVl c3QsIHRydWUpOwogCi0gICAgY2xlYW51cFNvdXBSZXF1ZXN0T3BlcmF0aW9uKGhhbmRsZSk7Ci0g ICAgaWYgKCFjcmVhdGVTb3VwUmVxdWVzdEFuZE1lc3NhZ2VGb3JIYW5kbGUoaGFuZGxlLCBuZXdS ZXF1ZXN0LCB0cnVlKSkgewotICAgICAgICBkLT5jbGllbnQoKS0+Y2Fubm90U2hvd1VSTChoYW5k bGUpOwotICAgICAgICByZXR1cm47Ci0gICAgfQotCiAgICAgLy8gSWYgd2Ugc2VudCBjcmVkZW50 aWFscyB3aXRoIHRoaXMgcmVxdWVzdCdzIFVSTCwgd2UgZG9uJ3Qgd2FudCB0aGUgcmVzcG9uc2Ug dG8gY2FycnkgdGhlbSB0bwogICAgIC8vIHRoZSBXZWJLaXQgbGF5ZXIuIFRoZXkgd2VyZSBvbmx5 IHBsYWNlZCBpbiB0aGUgVVJMIGZvciB0aGUgYmVuZWZpdCBvZiBsaWJzb3VwLgogICAgIG5ld1Jl cXVlc3QucmVtb3ZlQ3JlZGVudGlhbHMoKTsKQEAgLTUxNiw2ICs1MTAsMTggQEAgc3RhdGljIHZv aWQgZG9SZWRpcmVjdChSZXNvdXJjZUhhbmRsZSogaGFuZGxlKQogICAgICAgICBkLT5jbGllbnQo KS0+d2lsbFNlbmRSZXF1ZXN0QXN5bmMoaGFuZGxlLCBuZXdSZXF1ZXN0LCBkLT5tX3Jlc3BvbnNl KTsKICAgICBlbHNlCiAgICAgICAgIGQtPmNsaWVudCgpLT53aWxsU2VuZFJlcXVlc3QoaGFuZGxl LCBuZXdSZXF1ZXN0LCBkLT5tX3Jlc3BvbnNlKTsKKworICAgIGNsZWFudXBTb3VwUmVxdWVzdE9w ZXJhdGlvbihoYW5kbGUpOworCisgICAgLy8gd2lsbFNlbmRSZXF1ZXN0IG1pZ2h0IGNhbmNlbCB0 aGUgbG9hZC4KKyAgICBpZiAoaGFuZGxlLT5jYW5jZWxsZWRPckNsaWVudGxlc3MoKSkKKyAgICAg ICAgcmV0dXJuOworCisgICAgaWYgKCFjcmVhdGVTb3VwUmVxdWVzdEFuZE1lc3NhZ2VGb3JIYW5k bGUoaGFuZGxlLCBuZXdSZXF1ZXN0LCB0cnVlKSkgeworICAgICAgICBkLT5jbGllbnQoKS0+Y2Fu bm90U2hvd1VSTChoYW5kbGUpOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaGFuZGxl LT5zZW5kUGVuZGluZ1JlcXVlc3QoKTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdDIv Q2hhbmdlTG9nIGIvU291cmNlL1dlYktpdDIvQ2hhbmdlTG9nCmluZGV4IDdjZDFlYzcuLjNiODYw ZjYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQyL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2Vi S2l0Mi9DaGFuZ2VMb2cKQEAgLTEsNSArMSwxOSBAQAogMjAxMy0xMi0zMCAgQ2FybG9zIEdhcmNp YSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKKyAgICAgICAgW1NPVVBdIHdpbGxTZW5k UmVxdWVzdCBkb2Vzbid0IHdvcmsgYWZ0ZXIgYSByZWRpcmVjdAorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTI2MjkwCisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRlc3QgY2FzZXMgdG8gdGVzdCBzZW5k LXJlcXVlc3Qgc2lnbmFsIGluIGNhc2Ugb2YKKyAgICAgICAgcmVkaXJlY3Rpb24uCisKKyAgICAg ICAgKiBVSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcDoKKyAgICAgICAg KHRlc3RXZWJSZXNvdXJjZVNlbmRSZXF1ZXN0KToKKyAgICAgICAgKHNlcnZlckNhbGxiYWNrKToK KworMjAxMy0xMi0zMCAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+ CisKICAgICAgICAgW0dUS10gVGVzdCAvd2Via2l0Mi9XZWJLaXRXZWJWaWV3L2F1dGhlbnRpY2F0 aW9uLWNhbmNlbCBmYWlscyB3aXRoIG5ldHdvcmsgcHJvY2VzcyBlbmFibGVkCiAgICAgICAgIGh0 dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjYxMjkKIApkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdDIvVUlQcm9jZXNzL0FQSS9ndGsvdGVzdHMvVGVzdFJlc291cmNlcy5j cHAgYi9Tb3VyY2UvV2ViS2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2Vz LmNwcAppbmRleCBhNTlmZTdjLi41N2YxODJjIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0Mi9V SVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcAorKysgYi9Tb3VyY2UvV2Vi S2l0Mi9VSVByb2Nlc3MvQVBJL2d0ay90ZXN0cy9UZXN0UmVzb3VyY2VzLmNwcApAQCAtNTY4LDcg KzU2OCwxMCBAQCBwdWJsaWM6CiAgICAgICAgIGlmIChyZXNvdXJjZSAhPSBtX3Jlc291cmNlKQog ICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfdXJp X3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0sIG1fZXhwZWN0ZWROZXdSZXNvdXJjZVVSSS5k YXRhKCkpOworICAgICAgICBpZiAocmVkaXJlY3RSZXNwb25zZSkKKyAgICAgICAgICAgIGdfYXNz ZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0sIG1fZXhw ZWN0ZWROZXdSZXNvdXJjZVVSSUFmdGVyUmVkaXJlY3Rpb24uZGF0YSgpKTsKKyAgICAgICAgZWxz ZQorICAgICAgICAgICAgZ19hc3NlcnRfY21wc3RyKHdlYmtpdF91cmlfcmVxdWVzdF9nZXRfdXJp KHJlcXVlc3QpLCA9PSwgbV9leHBlY3RlZE5ld1Jlc291cmNlVVJJLmRhdGEoKSk7CiAgICAgICAg IGdfYXNzZXJ0X2NtcHN0cih3ZWJraXRfdXJpX3JlcXVlc3RfZ2V0X3VyaShyZXF1ZXN0KSwgPT0s IHdlYmtpdF93ZWJfcmVzb3VyY2VfZ2V0X3VyaShyZXNvdXJjZSkpOwogCiAgICAgICAgIFNpbmds ZVJlc291cmNlTG9hZFRlc3Q6OnJlc291cmNlU2VudFJlcXVlc3QocmVzb3VyY2UsIHJlcXVlc3Qs IHJlZGlyZWN0UmVzcG9uc2UpOwpAQCAtNTk1LDggKzU5OCwxNCBAQCBwdWJsaWM6CiAgICAgICAg IG1fZXhwZWN0ZWRDYW5jZWxsZWRSZXNvdXJjZVVSSSA9IHVyaTsKICAgICB9CiAKKyAgICB2b2lk IHNldEV4cGVjdGVkTmV3UmVzb3VyY2VVUklBZnRlclJlZGlyZWN0aW9uKGNvbnN0IENTdHJpbmcm IHVyaSkKKyAgICB7CisgICAgICAgIG1fZXhwZWN0ZWROZXdSZXNvdXJjZVVSSUFmdGVyUmVkaXJl Y3Rpb24gPSB1cmk7CisgICAgfQorCiAgICAgQ1N0cmluZyBtX2V4cGVjdGVkTmV3UmVzb3VyY2VV Ukk7CiAgICAgQ1N0cmluZyBtX2V4cGVjdGVkQ2FuY2VsbGVkUmVzb3VyY2VVUkk7CisgICAgQ1N0 cmluZyBtX2V4cGVjdGVkTmV3UmVzb3VyY2VVUklBZnRlclJlZGlyZWN0aW9uOwogfTsKIAogc3Rh dGljIHZvaWQgdGVzdFdlYlJlc291cmNlU2VuZFJlcXVlc3QoU2VuZFJlcXVlc3RUZXN0KiB0ZXN0 LCBnY29uc3Rwb2ludGVyKQpAQCAtNjI2LDYgKzYzNSwzNiBAQCBzdGF0aWMgdm9pZCB0ZXN0V2Vi UmVzb3VyY2VTZW5kUmVxdWVzdChTZW5kUmVxdWVzdFRlc3QqIHRlc3QsIGdjb25zdHBvaW50ZXIp CiAgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1sxXSwgPT0sIFNpbmdsZVJlc291cmNlTG9hZFRl c3Q6OkZhaWxlZCk7CiAgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1syXSwgPT0sIFNpbmdsZVJl c291cmNlTG9hZFRlc3Q6OkZpbmlzaGVkKTsKICAgICBldmVudHMuY2xlYXIoKTsKKworICAgIC8v IFVSSSBjaGFuZ2VkIGFmdGVyIGEgcmVkaXJlY3QuCisgICAgdGVzdC0+c2V0RXhwZWN0ZWROZXdS ZXNvdXJjZVVSSShrU2VydmVyLT5nZXRVUklGb3JQYXRoKCIvcmVkaXJlY3RlZC5qcyIpKTsKKyAg ICB0ZXN0LT5zZXRFeHBlY3RlZE5ld1Jlc291cmNlVVJJQWZ0ZXJSZWRpcmVjdGlvbihrU2VydmVy LT5nZXRVUklGb3JQYXRoKCIvamF2YXNjcmlwdC5qcyIpKTsKKyAgICB0ZXN0LT5sb2FkVVJJKGtT ZXJ2ZXItPmdldFVSSUZvclBhdGgoInJlZGlyZWN0ZWQtamF2YXNjcmlwdC5odG1sIikuZGF0YSgp KTsKKyAgICB0ZXN0LT53YWl0VW50aWxSZXNvdXJjZUxvYWRGaW5pc2hlZCgpOworICAgIGdfYXNz ZXJ0KHRlc3QtPm1fcmVzb3VyY2UpOworCisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50cy5zaXpl KCksID09LCA2KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzBdLCA9PSwgU2luZ2xlUmVz b3VyY2VMb2FkVGVzdDo6U3RhcnRlZCk7CisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1sxXSwg PT0sIFNpbmdsZVJlc291cmNlTG9hZFRlc3Q6OlNlbnRSZXF1ZXN0KTsKKyAgICBnX2Fzc2VydF9j bXBpbnQoZXZlbnRzWzJdLCA9PSwgU2luZ2xlUmVzb3VyY2VMb2FkVGVzdDo6UmVkaXJlY3RlZCk7 CisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1szXSwgPT0sIFNpbmdsZVJlc291cmNlTG9hZFRl c3Q6OlJlY2VpdmVkUmVzcG9uc2UpOworICAgIGdfYXNzZXJ0X2NtcGludChldmVudHNbNF0sID09 LCBTaW5nbGVSZXNvdXJjZUxvYWRUZXN0OjpSZWNlaXZlZERhdGEpOworICAgIGdfYXNzZXJ0X2Nt cGludChldmVudHNbNV0sID09LCBTaW5nbGVSZXNvdXJjZUxvYWRUZXN0OjpGaW5pc2hlZCk7Cisg ICAgZXZlbnRzLmNsZWFyKCk7CisKKyAgICAvLyBDYW5jZWwgYWZ0ZXIgYSByZWRpcmVjdC4KKyAg ICB0ZXN0LT5zZXRFeHBlY3RlZE5ld1Jlc291cmNlVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgo Ii9yZWRpcmVjdGVkLXRvLWNhbmNlbC5qcyIpKTsKKyAgICB0ZXN0LT5zZXRFeHBlY3RlZENhbmNl bGxlZFJlc291cmNlVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9yZWRpcmVjdGVkLXRvLWNh bmNlbC5qcyIpKTsKKyAgICB0ZXN0LT5sb2FkVVJJKGtTZXJ2ZXItPmdldFVSSUZvclBhdGgoIi9y ZWRpcmVjdGVkLXRvLWNhbmNlbC5odG1sIikuZGF0YSgpKTsKKyAgICB0ZXN0LT53YWl0VW50aWxS ZXNvdXJjZUxvYWRGaW5pc2hlZCgpOworICAgIGdfYXNzZXJ0KHRlc3QtPm1fcmVzb3VyY2UpOwor CisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50cy5zaXplKCksID09LCA0KTsKKyAgICBnX2Fzc2Vy dF9jbXBpbnQoZXZlbnRzWzBdLCA9PSwgU2luZ2xlUmVzb3VyY2VMb2FkVGVzdDo6U3RhcnRlZCk7 CisgICAgZ19hc3NlcnRfY21waW50KGV2ZW50c1sxXSwgPT0sIFNpbmdsZVJlc291cmNlTG9hZFRl c3Q6OlNlbnRSZXF1ZXN0KTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRzWzJdLCA9PSwgU2lu Z2xlUmVzb3VyY2VMb2FkVGVzdDo6RmFpbGVkKTsKKyAgICBnX2Fzc2VydF9jbXBpbnQoZXZlbnRz WzNdLCA9PSwgU2luZ2xlUmVzb3VyY2VMb2FkVGVzdDo6RmluaXNoZWQpOworICAgIGV2ZW50cy5j bGVhcigpOwogfQogCiBzdGF0aWMgdm9pZCBhZGRDYWNoZUhUVFBIZWFkZXJzVG9SZXNwb25zZShT b3VwTWVzc2FnZSogbWVzc2FnZSkKQEAgLTY4OCw2ICs3MjcsMTIgQEAgc3RhdGljIHZvaWQgc2Vy dmVyQ2FsbGJhY2soU291cFNlcnZlciogc2VydmVyLCBTb3VwTWVzc2FnZSogbWVzc2FnZSwgY29u c3QgY2hhcioKICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvcmVzb3VyY2UtdG8t Y2FuY2VsLmh0bWwiKSkgewogICAgICAgICBzdGF0aWMgY29uc3QgY2hhciogcmVzb3VyY2VUb0Nh bmNlbEhUTUwgPSAiPGh0bWw+PGhlYWQ+PHNjcmlwdCBsYW5ndWFnZT0namF2YXNjcmlwdCcgc3Jj PSdjYW5jZWwtdGhpcy5qcyc+PC9zY3JpcHQ+PC9oZWFkPjxib2R5PjwvYm9keT48L2h0bWw+IjsK ICAgICAgICAgc291cF9tZXNzYWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHks IFNPVVBfTUVNT1JZX1NUQVRJQywgcmVzb3VyY2VUb0NhbmNlbEhUTUwsIHN0cmxlbihyZXNvdXJj ZVRvQ2FuY2VsSFRNTCkpOworICAgIH0gZWxzZSBpZiAoZ19zdHJfZXF1YWwocGF0aCwgIi9yZWRp cmVjdGVkLWphdmFzY3JpcHQuaHRtbCIpKSB7CisgICAgICAgIHN0YXRpYyBjb25zdCBjaGFyKiBq YXZhc2NyaXB0UmVsYXRpdmVIVE1MID0gIjxodG1sPjxoZWFkPjxzY3JpcHQgbGFuZ3VhZ2U9J2ph dmFzY3JpcHQnIHNyYz0nL3JlZGlyZWN0ZWQuanMnPjwvc2NyaXB0PjwvaGVhZD48Ym9keT48L2Jv ZHk+PC9odG1sPiI7CisgICAgICAgIHNvdXBfbWVzc2FnZV9ib2R5X2FwcGVuZChtZXNzYWdlLT5y ZXNwb25zZV9ib2R5LCBTT1VQX01FTU9SWV9TVEFUSUMsIGphdmFzY3JpcHRSZWxhdGl2ZUhUTUws IHN0cmxlbihqYXZhc2NyaXB0UmVsYXRpdmVIVE1MKSk7CisgICAgfSBlbHNlIGlmIChnX3N0cl9l cXVhbChwYXRoLCAiL3JlZGlyZWN0ZWQtdG8tY2FuY2VsLmh0bWwiKSkgeworICAgICAgICBzdGF0 aWMgY29uc3QgY2hhciogamF2YXNjcmlwdFJlbGF0aXZlSFRNTCA9ICI8aHRtbD48aGVhZD48c2Ny aXB0IGxhbmd1YWdlPSdqYXZhc2NyaXB0JyBzcmM9Jy9yZWRpcmVjdGVkLXRvLWNhbmNlbC5qcyc+ PC9zY3JpcHQ+PC9oZWFkPjxib2R5PjwvYm9keT48L2h0bWw+IjsKKyAgICAgICAgc291cF9tZXNz YWdlX2JvZHlfYXBwZW5kKG1lc3NhZ2UtPnJlc3BvbnNlX2JvZHksIFNPVVBfTUVNT1JZX1NUQVRJ QywgamF2YXNjcmlwdFJlbGF0aXZlSFRNTCwgc3RybGVuKGphdmFzY3JpcHRSZWxhdGl2ZUhUTUwp KTsKICAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvYmxhbmsuaWNvIikpIHsKICAg ICAgICAgR093blB0cjxjaGFyPiBmaWxlUGF0aChnX2J1aWxkX2ZpbGVuYW1lKFRlc3Q6OmdldFdl YktpdDFUZXN0UmVzb3VjZXNEaXIoKS5kYXRhKCksIHBhdGgsIE5VTEwpKTsKICAgICAgICAgY2hh ciogY29udGVudHM7CkBAIC03MDcsNiArNzUyLDEyIEBAIHN0YXRpYyB2b2lkIHNlcnZlckNhbGxi YWNrKFNvdXBTZXJ2ZXIqIHNlcnZlciwgU291cE1lc3NhZ2UqIG1lc3NhZ2UsIGNvbnN0IGNoYXIq CiAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL3JlZGlyZWN0ZWQuY3NzIikpIHsK ICAgICAgICAgc291cF9tZXNzYWdlX3NldF9zdGF0dXMobWVzc2FnZSwgU09VUF9TVEFUVVNfTU9W RURfUEVSTUFORU5UTFkpOwogICAgICAgICBzb3VwX21lc3NhZ2VfaGVhZGVyc19hcHBlbmQobWVz c2FnZS0+cmVzcG9uc2VfaGVhZGVycywgIkxvY2F0aW9uIiwgIi9zaW1wbGUtc3R5bGUuY3NzIik7 CisgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL3JlZGlyZWN0ZWQuanMiKSkgewor ICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdlLCBTT1VQX1NUQVRVU19NT1ZF RF9QRVJNQU5FTlRMWSk7CisgICAgICAgIHNvdXBfbWVzc2FnZV9oZWFkZXJzX2FwcGVuZChtZXNz YWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiTG9jYXRpb24iLCAiL3JlbW92ZS10aGlzL2phdmFzY3Jp cHQuanMiKTsKKyAgICB9IGVsc2UgaWYgKGdfc3RyX2VxdWFsKHBhdGgsICIvcmVkaXJlY3RlZC10 by1jYW5jZWwuanMiKSkgeworICAgICAgICBzb3VwX21lc3NhZ2Vfc2V0X3N0YXR1cyhtZXNzYWdl LCBTT1VQX1NUQVRVU19NT1ZFRF9QRVJNQU5FTlRMWSk7CisgICAgICAgIHNvdXBfbWVzc2FnZV9o ZWFkZXJzX2FwcGVuZChtZXNzYWdlLT5yZXNwb25zZV9oZWFkZXJzLCAiTG9jYXRpb24iLCAiL2Nh bmNlbC10aGlzLmpzIik7CiAgICAgfSBlbHNlIGlmIChnX3N0cl9lcXVhbChwYXRoLCAiL2ludmFs aWQuY3NzIikpCiAgICAgICAgIHNvdXBfbWVzc2FnZV9zZXRfc3RhdHVzKG1lc3NhZ2UsIFNPVVBf U1RBVFVTX0NBTlRfQ09OTkVDVCk7CiAgICAgZWxzZQo=