52419 2011-01-13 18:19:51 -0800 REGRESSION (r71884): Cross-origin XHR fails if willSendRequest changes the URL 2011-01-13 23:04:18 -0800 1 1 1 Unclassified WebKit Page Loading 528+ (Nightly build) All All RESOLVED FIXED InRadar, Regression P1 Normal --- 1 mitz mitz abarth ap beidson eric hayato japhet webkit.review.bot oldest_to_newest 334071 0 mitz 2011-01-13 18:19:51 -0800 REGRESSION (r71884): Cross-origin XHR fails if willSendRequest changes the URL 334072 1 mitz 2011-01-13 18:20:52 -0800 <rdar://problem/8827065> 334074 2 78882 mitz 2011-01-13 18:30:40 -0800 Created attachment 78882 Patch 334078 3 78882 ap 2011-01-13 18:56:34 -0800 Comment on attachment 78882 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=78882&action=review Looks great. > Tools/ChangeLog:8 > + Allow to furthur control the behavior of the willSendRequest delegate callback by making it furthur? > LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt:5 > +CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. Please make this test explain what the expected behavior is. Does it somehow pass on other platforms, or does it need to be added to Skipped lists? 334088 4 mitz 2011-01-13 19:37:51 -0800 (In reply to comment #3) > (From update of attachment 78882 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=78882&action=review > > Looks great. > > > Tools/ChangeLog:8 > > + Allow to furthur control the behavior of the willSendRequest delegate callback by making it > > furthur? Something wrong with my spulling? > > > LayoutTests/http/tests/loading/cross-origin-XHR-willLoadRequest-expected.txt:5 > > +CONSOLE MESSAGE: line 1: XMLHttpRequest cannot load http://localhost:8000/loading/resources/foo.txt. Origin http://127.0.0.1:8000 is not allowed by Access-Control-Allow-Origin. > > Please make this test explain what the expected behavior is. OK. > Does it somehow pass on other platforms, or does it need to be added to Skipped lists? I don't see how It can pass on other platforms. I suppose the EWS does not run new tests. I will skip. Thanks for the review! 334099 5 mitz 2011-01-13 21:20:41 -0800 Fixed in <http://trac.webkit.org/changeset/75768>. 334126 6 webkit.review.bot 2011-01-13 22:35:28 -0800 http://trac.webkit.org/changeset/75768 might have broken Qt Linux Release 334131 7 hayato 2011-01-13 23:04:18 -0800 I've fixed Skipped lists in r75768: https://trac.webkit.org/changeset/75771 It seems they don't have '.html' suffix. 78882 2011-01-13 18:30:40 -0800 2011-01-13 18:56:34 -0800 Patch bug-52419-20110113183039.patch text/plain 11095 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDc1NzY0KQorKysgU291cmNlL1dlYkNvcmUvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTEtMDEtMTMgIERhbiBCZXJu c3RlaW4gIDxtaXR6QGFwcGxlLmNvbT4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICA8cmRhcjovL3Byb2JsZW0vODgyNzA2NT4gUkVHUkVTU0lPTiAocjcx ODg0KTogQ3Jvc3Mtb3JpZ2luIFhIUiBmYWlscyBpZiB3aWxsU2VuZFJlcXVlc3QgY2hhbmdlcyB0 aGUgVVJMCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD01 MjQxOQorCisgICAgICAgIFRlc3Q6IGh0dHAvdGVzdHMvbG9hZGluZy9jcm9zcy1vcmlnaW4tWEhS LXdpbGxMb2FkUmVxdWVzdC5odG1sCisKKyAgICAgICAgKiBsb2FkZXIvUmVzb3VyY2VMb2FkZXIu Y3BwOgorICAgICAgICAoV2ViQ29yZTo6UmVzb3VyY2VMb2FkZXI6OmluaXQpOiBDb21wbGV0ZSBy NzQ0NTMgYnkgZW5zdXJpbmcgdGhhdCBtX3JlcXVlc3QgaXMgb25seSBzZXQgYWZ0ZXIKKyAgICAg ICAgd2lsbFNlbmRSZXF1ZXN0KCkuIE90aGVyd2lzZSwgd2lsbFNlbmRSZXF1ZXN0KCkgZW5kcyB1 cCBjYWxsaW5nIGludG8KKyAgICAgICAgVGhyZWFkYWJsZURvY3VtZW50UmVxdWVzdDo6d2lsbFNl bmRSZXF1ZXN0KCksIHdoaWNoIGNhbmNlbHMgdGhlIHJlcXVlc3QuCisKIDIwMTEtMDEtMTMgIE1p a2UgVGhvbGUgIDxtdGhvbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2VkIGJ5IERhcmlu IEFkbGVyIGFuZCBCcmFkeSBFaWRzb24uCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9sb2FkZXIvUmVz b3VyY2VMb2FkZXIuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2xvYWRlci9SZXNv dXJjZUxvYWRlci5jcHAJKHJldmlzaW9uIDc1NzY0KQorKysgU291cmNlL1dlYkNvcmUvbG9hZGVy L1Jlc291cmNlTG9hZGVyLmNwcAkod29ya2luZyBjb3B5KQpAQCAtMSw1ICsxLDUgQEAKIC8qCi0g KiBDb3B5cmlnaHQgKEMpIDIwMDYsIDIwMDcgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVk LgorICogQ29weXJpZ2h0IChDKSAyMDA2LCAyMDA3LCAyMDEwLCAyMDExIEFwcGxlIEluYy4gQWxs IHJpZ2h0cyByZXNlcnZlZC4KICAqICAgICAgICAgICAoQykgMjAwNyBHcmFoYW0gRGVubmlzIChn cmFoYW0uZGVubmlzQGdtYWlsLmNvbSkKICAqCiAgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGlu IHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKQEAgLTEyOSwxNCArMTI5 LDEzIEBAIGJvb2wgUmVzb3VyY2VMb2FkZXI6OmluaXQoY29uc3QgUmVzb3VyY2UKICAgICAgICAg ICAgIGNsaWVudFJlcXVlc3Quc2V0Rmlyc3RQYXJ0eUZvckNvb2tpZXMoZG9jdW1lbnQtPmZpcnN0 UGFydHlGb3JDb29raWVzKCkpOwogICAgIH0KIAotICAgIG1fcmVxdWVzdCA9IGNsaWVudFJlcXVl c3Q7Ci0KLSAgICB3aWxsU2VuZFJlcXVlc3QobV9yZXF1ZXN0LCBSZXNvdXJjZVJlc3BvbnNlKCkp OwotICAgIGlmIChtX3JlcXVlc3QuaXNOdWxsKCkpIHsKKyAgICB3aWxsU2VuZFJlcXVlc3QoY2xp ZW50UmVxdWVzdCwgUmVzb3VyY2VSZXNwb25zZSgpKTsKKyAgICBpZiAoY2xpZW50UmVxdWVzdC5p c051bGwoKSkgewogICAgICAgICBkaWRGYWlsKGZyYW1lTG9hZGVyKCktPmNhbmNlbGxlZEVycm9y KG1fcmVxdWVzdCkpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgfQogCisgICAgbV9yZXF1 ZXN0ID0gY2xpZW50UmVxdWVzdDsKICAgICByZXR1cm4gdHJ1ZTsKIH0KIApJbmRleDogVG9vbHMv Q2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gNzU3NjQp CisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwyNCBAQAorMjAx MS0wMS0xMyAgRGFuIEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84ODI3MDY1 PiBSRUdSRVNTSU9OIChyNzE4ODQpOiBDcm9zcy1vcmlnaW4gWEhSIGZhaWxzIGlmIHdpbGxTZW5k UmVxdWVzdCBjaGFuZ2VzIHRoZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTUyNDE5CisKKyAgICAgICAgQWxsb3cgdG8gZnVydGh1ciBjb250cm9s IHRoZSBiZWhhdmlvciBvZiB0aGUgd2lsbFNlbmRSZXF1ZXN0IGRlbGVnYXRlIGNhbGxiYWNrIGJ5 IG1ha2luZyBpdAorICAgICAgICBzZXQgYSBkaWZmZXJlbnQgVVJMIGluIHRoZSBuZXcgcmVxdWVz dC4KKworICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RDb250cm9sbGVyLmNwcDoK KyAgICAgICAgKGFkZFVSTFRvUmVkaXJlY3RDYWxsYmFjayk6IEFkZGVkLgorICAgICAgICAoTGF5 b3V0VGVzdENvbnRyb2xsZXI6OnN0YXRpY0Z1bmN0aW9ucyk6IEFkZGVkIGFkZFVSTFRvUmVkaXJl Y3QuCisgICAgICAgIChMYXlvdXRUZXN0Q29udHJvbGxlcjo6YWRkVVJMVG9SZWRpcmVjdCk6IEFk ZGVkLiBBZGRzIHRoZSByZWRpcmVjdGlvbiB0byB0aGUgbWFwLgorICAgICAgICAoTGF5b3V0VGVz dENvbnRyb2xsZXI6OnJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwpOiBBZGRlZCB0aGlzIGdl dHRlci4KKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9MYXlvdXRUZXN0Q29udHJvbGxlci5oOgor ICAgICAgICAqIER1bXBSZW5kZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbToKKyAg ICAgICAgKC1bUmVzb3VyY2VMb2FkRGVsZWdhdGUgd2ViVmlldzpyZXNvdXJjZTp3aWxsU2VuZFJl cXVlc3Q6cmVkaXJlY3RSZXNwb25zZTpmcm9tRGF0YVNvdXJjZTpdKTogQ2hlY2sKKyAgICAgICAg aWYgdGhlcmUgaXMgYSByZWRpcmVjdGlvbiBmb3IgdGhlIHJlcXVlc3TigJlzIFVSTCwgZXN0YWJs aXNoZWQgYnkgYWRkVVJMVG9SZWRpcmVjdCgpLCBhbmQgaWYgc28sCisgICAgICAgIGNoYW5nZSB0 aGUgVVJMIGluIHRoZSBuZXcgcmVxdWVzdCB0byB0aGUgcmVkaXJlY3QgZGVzdGluYXRpb24uCisK IDIwMTEtMDEtMTMgIEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIFJl dmlld2VkIGJ5IE1paGFpIFBhcnBhcml0YS4KSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xh eW91dFRlc3RDb250cm9sbGVyLmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVuZGVyVHJl ZS9MYXlvdXRUZXN0Q29udHJvbGxlci5jcHAJKHJldmlzaW9uIDc1NzY0KQorKysgVG9vbHMvRHVt cFJlbmRlclRyZWUvTGF5b3V0VGVzdENvbnRyb2xsZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0x LDUgKzEsNSBAQAogLyoKLSAqIENvcHlyaWdodCAoQykgMjAwNywgMjAwOCwgMjAwOSBBcHBsZSBJ bmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisgKiBDb3B5cmlnaHQgKEMpIDIwMDcsIDIwMDgsIDIw MDksIDIwMTEgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogICogQ29weXJpZ2h0IChD KSAyMDEwIEpvb25lIEh1ciA8am9vbmVAa2xkcC5vcmc+CiAgKgogICogUmVkaXN0cmlidXRpb24g YW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0z MzUsNiArMzM1LDMxIEBAIHN0YXRpYyBKU1ZhbHVlUmVmIGFkZERpc2FsbG93ZWRVUkxDYWxsYmEK ICAgICByZXR1cm4gSlNWYWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CiB9CiAKK3N0YXRpYyBK U1ZhbHVlUmVmIGFkZFVSTFRvUmVkaXJlY3RDYWxsYmFjayhKU0NvbnRleHRSZWYgY29udGV4dCwg SlNPYmplY3RSZWYgZnVuY3Rpb24sIEpTT2JqZWN0UmVmIHRoaXNPYmplY3QsIHNpemVfdCBhcmd1 bWVudENvdW50LCBjb25zdCBKU1ZhbHVlUmVmIGFyZ3VtZW50c1tdLCBKU1ZhbHVlUmVmKiBleGNl cHRpb24pCit7CisgICAgaWYgKGFyZ3VtZW50Q291bnQgPCAyKQorICAgICAgICByZXR1cm4gSlNW YWx1ZU1ha2VVbmRlZmluZWQoY29udGV4dCk7CisKKyAgICBKU1JldGFpblB0cjxKU1N0cmluZ1Jl Zj4gb3JpZ2luKEFkb3B0LCBKU1ZhbHVlVG9TdHJpbmdDb3B5KGNvbnRleHQsIGFyZ3VtZW50c1sw XSwgZXhjZXB0aW9uKSk7CisgICAgQVNTRVJUKCEqZXhjZXB0aW9uKTsKKworICAgIEpTUmV0YWlu UHRyPEpTU3RyaW5nUmVmPiBkZXN0aW5hdGlvbihBZG9wdCwgSlNWYWx1ZVRvU3RyaW5nQ29weShj b250ZXh0LCBhcmd1bWVudHNbMV0sIGV4Y2VwdGlvbikpOworICAgIEFTU0VSVCghKmV4Y2VwdGlv bik7CisKKyAgICBzaXplX3QgbWF4TGVuZ3RoID0gSlNTdHJpbmdHZXRNYXhpbXVtVVRGOENTdHJp bmdTaXplKG9yaWdpbi5nZXQoKSk7CisgICAgY2hhciogb3JpZ2luQnVmZmVyID0gbmV3IGNoYXJb bWF4TGVuZ3RoICsgMV07CisgICAgSlNTdHJpbmdHZXRVVEY4Q1N0cmluZyhvcmlnaW4uZ2V0KCks IG9yaWdpbkJ1ZmZlciwgbWF4TGVuZ3RoICsgMSk7CisKKyAgICBtYXhMZW5ndGggPSBKU1N0cmlu Z0dldE1heGltdW1VVEY4Q1N0cmluZ1NpemUoZGVzdGluYXRpb24uZ2V0KCkpOworICAgIGNoYXIq IGRlc3RpbmF0aW9uQnVmZmVyID0gbmV3IGNoYXJbbWF4TGVuZ3RoICsgMV07CisgICAgSlNTdHJp bmdHZXRVVEY4Q1N0cmluZyhkZXN0aW5hdGlvbi5nZXQoKSwgZGVzdGluYXRpb25CdWZmZXIsIG1h eExlbmd0aCArIDEpOworCisgICAgTGF5b3V0VGVzdENvbnRyb2xsZXIqIGNvbnRyb2xsZXIgPSBz dGF0aWNfY2FzdDxMYXlvdXRUZXN0Q29udHJvbGxlcio+KEpTT2JqZWN0R2V0UHJpdmF0ZSh0aGlz T2JqZWN0KSk7CisgICAgY29udHJvbGxlci0+YWRkVVJMVG9SZWRpcmVjdChvcmlnaW5CdWZmZXIs IGRlc3RpbmF0aW9uQnVmZmVyKTsKKworICAgIHJldHVybiBKU1ZhbHVlTWFrZVVuZGVmaW5lZChj b250ZXh0KTsKK30KKwogc3RhdGljIEpTVmFsdWVSZWYgY2FsbFNob3VsZENsb3NlT25XZWJWaWV3 Q2FsbGJhY2soSlNDb250ZXh0UmVmIGNvbnRleHQsIEpTT2JqZWN0UmVmIGZ1bmN0aW9uLCBKU09i amVjdFJlZiB0aGlzT2JqZWN0LCBzaXplX3QgYXJndW1lbnRDb3VudCwgY29uc3QgSlNWYWx1ZVJl ZiBhcmd1bWVudHNbXSwgSlNWYWx1ZVJlZiogZXhjZXB0aW9uKQogewogICAgIC8vIEhhcyBtYWMg JiB3aW5kb3dzIGltcGxlbWVudGF0aW9uCkBAIC0xOTMwLDYgKzE5NTUsNyBAQCBKU1N0YXRpY0Z1 bmN0aW9uKiBMYXlvdXRUZXN0Q29udHJvbGxlcjo6CiAgICAgc3RhdGljIEpTU3RhdGljRnVuY3Rp b24gc3RhdGljRnVuY3Rpb25zW10gPSB7CiAgICAgICAgIHsgImFib3J0TW9kYWwiLCBhYm9ydE1v ZGFsQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQcm9wZXJ0eUF0 dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiYWRkRGlzYWxsb3dlZFVSTCIsIGFkZERp c2FsbG93ZWRVUkxDYWxsYmFjaywga0pTUHJvcGVydHlBdHRyaWJ1dGVSZWFkT25seSB8IGtKU1By b3BlcnR5QXR0cmlidXRlRG9udERlbGV0ZSB9LAorICAgICAgICB7ICJhZGRVUkxUb1JlZGlyZWN0 IiwgYWRkVVJMVG9SZWRpcmVjdENhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZVJlYWRPbmx5 IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAgIHsgImFkZFVzZXJT Y3JpcHQiLCBhZGRVc2VyU2NyaXB0Q2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9u bHkgfCBrSlNQcm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKICAgICAgICAgeyAiYWRkVXNl clN0eWxlU2hlZXQiLCBhZGRVc2VyU3R5bGVTaGVldENhbGxiYWNrLCBrSlNQcm9wZXJ0eUF0dHJp YnV0ZVJlYWRPbmx5IHwga0pTUHJvcGVydHlBdHRyaWJ1dGVEb250RGVsZXRlIH0sCiAgICAgICAg IHsgImFwaVRlc3ROZXdXaW5kb3dEYXRhTG9hZEJhc2VVUkwiLCBhcGlUZXN0TmV3V2luZG93RGF0 YUxvYWRCYXNlVVJMQ2FsbGJhY2ssIGtKU1Byb3BlcnR5QXR0cmlidXRlUmVhZE9ubHkgfCBrSlNQ cm9wZXJ0eUF0dHJpYnV0ZURvbnREZWxldGUgfSwKQEAgLTIxNDAsNSArMjE2NiwxNSBAQCB2b2lk IExheW91dFRlc3RDb250cm9sbGVyOjpzZXRQT1NJWExvY2FsCiAgICAgc2V0bG9jYWxlKExDX0FM TCwgbG9jYWxlQnVmKTsKIH0KIAordm9pZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6YWRkVVJMVG9S ZWRpcmVjdChzdGQ6OnN0cmluZyBvcmlnaW4sIHN0ZDo6c3RyaW5nIGRlc3RpbmF0aW9uKQorewor ICAgIG1fVVJMc1RvUmVkaXJlY3Rbb3JpZ2luXSA9IGRlc3RpbmF0aW9uOworfQorCitjb25zdCBz dGQ6OnN0cmluZyYgTGF5b3V0VGVzdENvbnRyb2xsZXI6OnJlZGlyZWN0aW9uRGVzdGluYXRpb25G b3JVUkwoc3RkOjpzdHJpbmcgb3JpZ2luKQoreworICAgIHJldHVybiBtX1VSTHNUb1JlZGlyZWN0 W29yaWdpbl07Cit9CisKIGNvbnN0IHVuc2lnbmVkIExheW91dFRlc3RDb250cm9sbGVyOjptYXhW aWV3V2lkdGggPSA4MDA7CiBjb25zdCB1bnNpZ25lZCBMYXlvdXRUZXN0Q29udHJvbGxlcjo6bWF4 Vmlld0hlaWdodCA9IDYwMDsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL0xheW91dFRlc3RD b250cm9sbGVyLmgKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvTGF5b3V0VGVz dENvbnRyb2xsZXIuaAkocmV2aXNpb24gNzU3NjQpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9M YXlvdXRUZXN0Q29udHJvbGxlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0zMSw2ICszMSw3IEBACiAK ICNpbmNsdWRlIDxKYXZhU2NyaXB0Q29yZS9KU09iamVjdFJlZi5oPgogI2luY2x1ZGUgPEphdmFT Y3JpcHRDb3JlL0pTUmV0YWluUHRyLmg+CisjaW5jbHVkZSA8bWFwPgogI2luY2x1ZGUgPHNldD4K ICNpbmNsdWRlIDxzdHJpbmc+CiAjaW5jbHVkZSA8dmVjdG9yPgpAQCAtNDUsNiArNDYsOCBAQCBw dWJsaWM6CiAgICAgdm9pZCBtYWtlV2luZG93T2JqZWN0KEpTQ29udGV4dFJlZiBjb250ZXh0LCBK U09iamVjdFJlZiB3aW5kb3dPYmplY3QsIEpTVmFsdWVSZWYqIGV4Y2VwdGlvbik7CiAKICAgICB2 b2lkIGFkZERpc2FsbG93ZWRVUkwoSlNTdHJpbmdSZWYgdXJsKTsKKyAgICB2b2lkIGFkZFVSTFRv UmVkaXJlY3Qoc3RkOjpzdHJpbmcgb3JpZ2luLCBzdGQ6OnN0cmluZyBkZXN0aW5hdGlvbik7Cisg ICAgY29uc3Qgc3RkOjpzdHJpbmcmIHJlZGlyZWN0aW9uRGVzdGluYXRpb25Gb3JVUkwoc3RkOjpz dHJpbmcpOwogICAgIHZvaWQgY2xlYXJBbGxBcHBsaWNhdGlvbkNhY2hlcygpOwogICAgIHZvaWQg Y2xlYXJBbGxEYXRhYmFzZXMoKTsKICAgICB2b2lkIGNsZWFyQmFja0ZvcndhcmRMaXN0KCk7CkBA IC0zNjEsNiArMzY0LDggQEAgcHJpdmF0ZToKICAgICAKICAgICAvLyBvcmlnaW5zIHdoaWNoIGhh dmUgYmVlbiBncmFudGVkIGRlc2t0b3Agbm90aWZpY2F0aW9uIGFjY2VzcwogICAgIHN0ZDo6dmVj dG9yPEpTU3RyaW5nUmVmPiBtX2Rlc2t0b3BOb3RpZmljYXRpb25BbGxvd2VkT3JpZ2luczsKKwor ICAgIHN0ZDo6bWFwPHN0ZDo6c3RyaW5nLCBzdGQ6OnN0cmluZz4gbV9VUkxzVG9SZWRpcmVjdDsK ICAgICAKICAgICBzdGF0aWMgSlNDbGFzc1JlZiBnZXRKU0NsYXNzKCk7CiAgICAgc3RhdGljIEpT U3RhdGljVmFsdWUqIHN0YXRpY1ZhbHVlcygpOwpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUv bWFjL1Jlc291cmNlTG9hZERlbGVnYXRlLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0R1bXBSZW5k ZXJUcmVlL21hYy9SZXNvdXJjZUxvYWREZWxlZ2F0ZS5tbQkocmV2aXNpb24gNzU3NjQpCisrKyBU b29scy9EdW1wUmVuZGVyVHJlZS9tYWMvUmVzb3VyY2VMb2FkRGVsZWdhdGUubW0JKHdvcmtpbmcg Y29weSkKQEAgLTEsNSArMSw1IEBACiAvKgotICogQ29weXJpZ2h0IChDKSAyMDA3LCBBcHBsZSBJ bmMuICBBbGwgcmlnaHRzIHJlc2VydmVkLgorICogQ29weXJpZ2h0IChDKSAyMDA3LCAyMDExIEFw cGxlIEluYy4gIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAgKgogICogUmVkaXN0cmlidXRpb24gYW5k IHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CiAgKiBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMKQEAgLTE2NSw2ICsxNjUsOSBAQCAtKE5TVVJMUmVxdWVzdCAqKXdlYlZpZXc6IChXZWJW aWV3ICopd3YgCiAgICAgICAgIFtuZXdSZXF1ZXN0IHNldFZhbHVlOm5pbCBmb3JIVFRQSGVhZGVy RmllbGQ6bnNIZWFkZXJdOwogICAgICAgICBbbnNIZWFkZXIgcmVsZWFzZV07CiAgICAgfQorICAg IGNvbnN0IHN0ZDo6c3RyaW5nJiBkZXN0aW5hdGlvbiA9IGdMYXlvdXRUZXN0Q29udHJvbGxlci0+ cmVkaXJlY3Rpb25EZXN0aW5hdGlvbkZvclVSTChbW3VybCBhYnNvbHV0ZVN0cmluZ10gVVRGOFN0 cmluZ10pOworICAgIGlmIChkZXN0aW5hdGlvbi5sZW5ndGgoKSkKKyAgICAgICAgW25ld1JlcXVl c3Qgc2V0VVJMOltOU1VSTCBVUkxXaXRoU3RyaW5nOltOU1N0cmluZyBzdHJpbmdXaXRoVVRGOFN0 cmluZzpkZXN0aW5hdGlvbi5kYXRhKCldXV07CiAKICAgICByZXR1cm4gW25ld1JlcXVlc3QgYXV0 b3JlbGVhc2VdOwogfQpJbmRleDogTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCj09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0t IExheW91dFRlc3RzL0NoYW5nZUxvZwkocmV2aXNpb24gNzU3NjQpCisrKyBMYXlvdXRUZXN0cy9D aGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wMS0xMyAgRGFu IEJlcm5zdGVpbiAgPG1pdHpAYXBwbGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS84ODI3MDY1PiBSRUdSRVNTSU9O IChyNzE4ODQpOiBDcm9zcy1vcmlnaW4gWEhSIGZhaWxzIGlmIHdpbGxTZW5kUmVxdWVzdCBjaGFu Z2VzIHRoZSBVUkwKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTUyNDE5CisKKyAgICAgICAgKiBodHRwL3Rlc3RzL2xvYWRpbmcvY3Jvc3Mtb3JpZ2luLVhI Ui13aWxsTG9hZFJlcXVlc3QtZXhwZWN0ZWQudHh0OiBBZGRlZC4KKyAgICAgICAgKiBodHRwL3Rl c3RzL2xvYWRpbmcvY3Jvc3Mtb3JpZ2luLVhIUi13aWxsTG9hZFJlcXVlc3QuaHRtbDogQWRkZWQu CisKIDIwMTEtMDEtMTMgIE1hcnRpbiBSb2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgog CiAgICAgICAgIFVucmV2aWV3ZWQsIHJvbGxpbmcgb3V0IHI3NTc0MC4KSW5kZXg6IExheW91dFRl c3RzL2h0dHAvdGVzdHMvbG9hZGluZy9jcm9zcy1vcmlnaW4tWEhSLXdpbGxMb2FkUmVxdWVzdC1l eHBlY3RlZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9sb2FkaW5n L2Nyb3NzLW9yaWdpbi1YSFItd2lsbExvYWRSZXF1ZXN0LWV4cGVjdGVkLnR4dAkocmV2aXNpb24g MCkKKysrIExheW91dFRlc3RzL2h0dHAvdGVzdHMvbG9hZGluZy9jcm9zcy1vcmlnaW4tWEhSLXdp bGxMb2FkUmVxdWVzdC1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNyBAQAor bWFpbiBmcmFtZSAtIGRpZFN0YXJ0UHJvdmlzaW9uYWxMb2FkRm9yRnJhbWUKK21haW4gZnJhbWUg LSBkaWRDb21taXRMb2FkRm9yRnJhbWUKK21haW4gZnJhbWUgLSBkaWRGaW5pc2hEb2N1bWVudExv YWRGb3JGcmFtZQorbWFpbiBmcmFtZSAtIGRpZEhhbmRsZU9ubG9hZEV2ZW50c0ZvckZyYW1lCitD T05TT0xFIE1FU1NBR0U6IGxpbmUgMTogWE1MSHR0cFJlcXVlc3QgY2Fubm90IGxvYWQgaHR0cDov L2xvY2FsaG9zdDo4MDAwL2xvYWRpbmcvcmVzb3VyY2VzL2Zvby50eHQuIE9yaWdpbiBodHRwOi8v MTI3LjAuMC4xOjgwMDAgaXMgbm90IGFsbG93ZWQgYnkgQWNjZXNzLUNvbnRyb2wtQWxsb3ctT3Jp Z2luLgorbWFpbiBmcmFtZSAtIGRpZEZpbmlzaExvYWRGb3JGcmFtZQorCkluZGV4OiBMYXlvdXRU ZXN0cy9odHRwL3Rlc3RzL2xvYWRpbmcvY3Jvc3Mtb3JpZ2luLVhIUi13aWxsTG9hZFJlcXVlc3Qu aHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9odHRwL3Rlc3RzL2xvYWRpbmcvY3Jvc3Mt b3JpZ2luLVhIUi13aWxsTG9hZFJlcXVlc3QuaHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRl c3RzL2h0dHAvdGVzdHMvbG9hZGluZy9jcm9zcy1vcmlnaW4tWEhSLXdpbGxMb2FkUmVxdWVzdC5o dG1sCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDggQEAKKzxzY3JpcHQ+CisgICAgbGF5b3V0VGVz dENvbnRyb2xsZXIuZHVtcEFzVGV4dCgpOworICAgIGxheW91dFRlc3RDb250cm9sbGVyLmFkZFVS TFRvUmVkaXJlY3QoImh0dHA6L2xvY2FsaG9zdDo4MDAwL2xvYWRpbmcvcmVzb3VyY2VzL2Jhci50 eHQiLCAiaHR0cDovL2xvY2FsaG9zdDo4MDAwL2xvYWRpbmcvcmVzb3VyY2VzL2Zvby50eHQiKTsK KworICAgIHZhciByZXF1ZXN0ID0gbmV3IFhNTEh0dHBSZXF1ZXN0KCk7CisgICAgcmVxdWVzdC5v cGVuKCJHRVQiLCAiaHR0cDovbG9jYWxob3N0OjgwMDAvbG9hZGluZy9yZXNvdXJjZXMvYmFyLnR4 dCIpOworICAgIHJlcXVlc3Quc2VuZCgpOworPC9zY3JpcHQ+Cg==