98137 2012-10-02 03:33:48 -0700 [XMLHttpRequest] overrideMimeType(mime) does not update the response's "Content-Type" header 2012-10-02 05:46:32 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED http://www.w3.org/TR/XMLHttpRequest/#dom-xmlhttprequest-overridemimetype P2 Normal --- 1 cdumez cdumez abarth eric gyuyoung.kim haraken kenneth laszlo.gombos tonikitoo webkit.review.bot oldest_to_newest 732481 0 cdumez 2012-10-02 03:33:48 -0700 As per the specification (http://www.w3.org/TR/XMLHttpRequest/#dom-xmlhttprequest-overridemimetype): """ client.overrideMimeType(mime) Sets the Content-Type header for the response to mime. """ However, with the current implementation, calling getResponseHeader("Content-Type") does not reflect the mime type passed to overrideMimeType(). Firefox behaves according the spec. 732486 1 166656 cdumez 2012-10-02 03:40:57 -0700 Created attachment 166656 Patch 732506 2 166656 haraken 2012-10-02 04:14:18 -0700 Comment on attachment 166656 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=166656&action=review > LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html:5 > + <script> Nit: I don't know the convention of xhr tests, but we are likely to write the main <script> and <script src="/js-test-resources/js-test-post.js"> at the end of <body>. > LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html:32 > + <div id="description"></div> > + <div id="console"></div> Nit: These are not needed. They will be added automatically. > Source/WebCore/ChangeLog:13 > + returned by client.getResponseHeader("Content-Type"). This patch makes sure > + the response's "Content-Type" header is properly updated with the override > + MIME type. This change looks reasonable, but would you just check cross-browser compatibility just in case (i.e. the behavior of Firefox, Opera and IE)? 732534 3 166665 cdumez 2012-10-02 04:35:27 -0700 Created attachment 166665 Patch Take Haraken's feedback into consideration. Firefox behaves according to spec (matches the behavior with this patch). Opera does not. I don't have Internet Explorer to test. 732536 4 166665 haraken 2012-10-02 04:36:34 -0700 Comment on attachment 166665 Patch OK, thanks for the clarification! 732582 5 166665 webkit.review.bot 2012-10-02 05:46:27 -0700 Comment on attachment 166665 Patch Clearing flags on attachment: 166665 Committed r130158: <http://trac.webkit.org/changeset/130158> 732583 6 webkit.review.bot 2012-10-02 05:46:32 -0700 All reviewed patches have been landed. Closing bug. 166656 2012-10-02 03:40:57 -0700 2012-10-02 04:35:27 -0700 Patch 98137_overrideMimeType.patch text/plain 5141 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlM2EyMmJmLi5mOWQyYzcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMTAt MDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBbWE1MSHR0cFJlcXVlc3RdIG92ZXJyaWRlTWltZVR5cGUobWltZSkgZG9lcyBub3QgdXBk YXRlIHRoZSByZXNwb25zZSdzICJDb250ZW50LVR5cGUiIGhlYWRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxMzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgdG8gY2hlY2sg dGhhdCBjYWxsaW5nIG92ZXJyaWRlTWltZVR5cGUobWltZSkgcHJvcGVybHkKKyAgICAgICAgc2V0 cyB0aGUgcmVzcG9uc2UncyAiQ29udGVudC1UeXBlIiBoZWFkZXIgdG8gbWltZS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1l dHlwZS1jb250ZW50LXR5cGUtaGVhZGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog aHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1vdmVycmlkZW1pbWV0eXBl LWNvbnRlbnQtdHlwZS1oZWFkZXIuaHRtbDogQWRkZWQuCisKIDIwMTItMTAtMDIgIEtlaXNoaSBI YXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTW9k aWZpY2F0aW9ucyBpbiBhIHNoYWRvdyB0cmVlIGRvbid0IHVwZGF0ZSB0aGUgRWxlbWVudHMgcGFu ZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3ht bGh0dHByZXF1ZXN0LW92ZXJyaWRlbWltZXR5cGUtY29udGVudC10eXBlLWhlYWRlci1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1 ZXN0LW92ZXJyaWRlbWltZXR5cGUtY29udGVudC10eXBlLWhlYWRlci1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGZiZTFlOAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qt b3ZlcnJpZGVtaW1ldHlwZS1jb250ZW50LXR5cGUtaGVhZGVyLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDEwIEBACitUaGlzIHRlc3RzIHRoYXQgWE1MSHR0cFJlcXVlc3Qgb3ZlcnJpZGVNaW1lVHlw ZSgpIHByb3Blcmx5IHVwZGF0ZXMgdGhlIENvbnRlbnQtVHlwZSBoZWFkZXIgZm9yIHRoZSByZXNw b25zZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgeGhyLmdldFJlc3Bv bnNlSGVhZGVyKCJDb250ZW50LVR5cGUiKSBpcyAidGV4dC94bWw7Y2hhcnNldD1HQksiCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1v dmVycmlkZW1pbWV0eXBlLWNvbnRlbnQtdHlwZS1oZWFkZXIuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1ldHlwZS1j b250ZW50LXR5cGUtaGVhZGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uNTljYTI5NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1s aHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1ldHlwZS1jb250ZW50LXR5cGUt aGVhZGVyLmh0bWwKQEAgLTAsMCArMSwzNCBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorICAgIDxzY3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorICAgIDxzY3JpcHQ+CisgICAgICAgIGRlc2NyaXB0aW9uKCdUaGlzIHRlc3Rz IHRoYXQgWE1MSHR0cFJlcXVlc3Qgb3ZlcnJpZGVNaW1lVHlwZSgpIHByb3Blcmx5IHVwZGF0ZXMg dGhlIENvbnRlbnQtVHlwZSBoZWFkZXIgZm9yIHRoZSByZXNwb25zZS4nKTsKKyAgICAgICAgd2lu ZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworCisgICAgICAgIHZhciB4aHIgPSBuZXcgWE1MSHR0 cFJlcXVlc3QoKTsKKyAgICAgICAgdmFyIHVybCA9ICdyZXNvdXJjZXMvcmVwbHkueG1sJzsKKwor ICAgICAgICB4aHIub25yZWFkeXN0YXRlY2hhbmdlID0gZnVuY3Rpb24gKCkgeworICAgICAgICAg ICAgaWYgKHhoci5yZWFkeVN0YXRlID09IHhoci5MT0FESU5HKSB7CisgICAgICAgICAgICAgICAg c2hvdWxkQmUoJ3hoci5nZXRSZXNwb25zZUhlYWRlcigiQ29udGVudC1UeXBlIiknLCAnInRleHQv eG1sO2NoYXJzZXQ9R0JLIicpOworICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAg ICAgICAgICAgfQorICAgICAgICB9CisKKyAgICAgICAgeGhyLm9uZXJyb3IgPSBmdW5jdGlvbigp IHsKKyAgICAgICAgICAgIHRlc3RGYWlsZWQoJ1RoZSBYSFIgcmVxdWVzdCB0byBhbiBleGlzdGlu ZyByZXNvdXJjZSBmYWlsZWQ6ICInICsgdXJsICsgJyInKTsKKyAgICAgICAgICAgIGZpbmlzaEpT VGVzdCgpOworICAgICAgICB9OworCisgICAgICAgIHhoci5vcGVuKCdHRVQnLCB1cmwpOworICAg ICAgICB4aHIub3ZlcnJpZGVNaW1lVHlwZSgndGV4dC94bWw7Y2hhcnNldD1HQksnKTsKKyAgICAg ICAgeGhyLnNlbmQoKTsKKyAgICA8L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iL2pzLXRlc3Qt cmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+PC9zY3JpcHQ+Cis8L2hlYWQ+Cis8Ym9keT4KKyAg ICA8ZGl2IGlkPSJkZXNjcmlwdGlvbiI+PC9kaXY+CisgICAgPGRpdiBpZD0iY29uc29sZSI+PC9k aXY+Cis8L2JvZHk+Cis8L2h0bWw+CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VM b2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggODA2ZWNkOC4uNWQ2ZWU0NCAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDEyLTEwLTAyICBDaHJpc3RvcGhlIER1bWV6ICA8 Y2hyaXN0b3BoZS5kdW1lekBpbnRlbC5jb20+CisKKyAgICAgICAgW1hNTEh0dHBSZXF1ZXN0XSBv dmVycmlkZU1pbWVUeXBlKG1pbWUpIGRvZXMgbm90IHVwZGF0ZSB0aGUgcmVzcG9uc2UncyAiQ29u dGVudC1UeXBlIiBoZWFkZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTk4MTM3CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisK KyAgICAgICAgQWNjb3JkaW5nIHRvIHRoZSBYTUxIdHRwUmVxdWVzdCBzcGVjaWZpY2F0aW9uLCBv dmVycmlkZU1pbWVUeXBlKG1pbWUpIHNldHMgdGhlCisgICAgICAgICJDb250ZW50LVR5cGUiIGhl YWRlciBmb3IgdGhlIHJlc3BvbnNlIHRvIG1pbWUuIEhvd2V2ZXIsIHdpdGggdGhlIGN1cnJlbnQK KyAgICAgICAgaW1wbGVtZW50YXRpb24sIGNhbGxpbmcgb3ZlcnJpZGVNaW1lVHlwZShtaW1lKSBk b2VzIG5vdCBhZmZlY3QgdGhlIHZhbHVlCisgICAgICAgIHJldHVybmVkIGJ5IGNsaWVudC5nZXRS ZXNwb25zZUhlYWRlcigiQ29udGVudC1UeXBlIikuIFRoaXMgcGF0Y2ggbWFrZXMgc3VyZQorICAg ICAgICB0aGUgcmVzcG9uc2UncyAiQ29udGVudC1UeXBlIiBoZWFkZXIgaXMgcHJvcGVybHkgdXBk YXRlZCB3aXRoIHRoZSBvdmVycmlkZQorICAgICAgICBNSU1FIHR5cGUuCisKKyAgICAgICAgVGVz dDogaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1vdmVycmlkZW1pbWV0 eXBlLWNvbnRlbnQtdHlwZS1oZWFkZXIuaHRtbAorCisgICAgICAgICogeG1sL1hNTEh0dHBSZXF1 ZXN0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlUmVz cG9uc2UpOgorCiAyMDEyLTEwLTAyICBOaWtpdGEgVmFzaWx5ZXYgIDxtZUBlbHYxcy5ydT4KIAog ICAgICAgICBXZWIgSW5zcGVjdG9yOiBDU1MgcHJvcGVydHkgbmFtZXMgYXV0b2NvbXBsZXRlOiBT dWdnZXN0IG1vc3QgdXNlZCByYXRoZXIgdGhhbiBhbHBoYWJldGljYWx5IGZpcnN0CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwIGIvU291cmNlL1dlYkNv cmUveG1sL1hNTEh0dHBSZXF1ZXN0LmNwcAppbmRleCAwOTdiYzQ0Li5lZTZmMjhjIDEwMDY0NAot LS0gYS9Tb3VyY2UvV2ViQ29yZS94bWwvWE1MSHR0cFJlcXVlc3QuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKQEAgLTExMTYsNyArMTExNiwxMSBAQCB2b2lk IFhNTEh0dHBSZXF1ZXN0OjpkaWRSZWNlaXZlUmVzcG9uc2UodW5zaWduZWQgbG9uZyBpZGVudGlm aWVyLCBjb25zdCBSZXNvdXJjZQogICAgIEluc3BlY3Rvckluc3RydW1lbnRhdGlvbjo6ZGlkUmVj ZWl2ZVhIUlJlc3BvbnNlKHNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSwgaWRlbnRpZmllcik7CiAK ICAgICBtX3Jlc3BvbnNlID0gcmVzcG9uc2U7Ci0gICAgbV9yZXNwb25zZUVuY29kaW5nID0gZXh0 cmFjdENoYXJzZXRGcm9tTWVkaWFUeXBlKG1fbWltZVR5cGVPdmVycmlkZSk7CisgICAgaWYgKCFt X21pbWVUeXBlT3ZlcnJpZGUuaXNFbXB0eSgpKSB7CisgICAgICAgIG1fcmVzcG9uc2Uuc2V0SFRU UEhlYWRlckZpZWxkKCJDb250ZW50LVR5cGUiLCBtX21pbWVUeXBlT3ZlcnJpZGUpOworICAgICAg ICBtX3Jlc3BvbnNlRW5jb2RpbmcgPSBleHRyYWN0Q2hhcnNldEZyb21NZWRpYVR5cGUobV9taW1l VHlwZU92ZXJyaWRlKTsKKyAgICB9CisKICAgICBpZiAobV9yZXNwb25zZUVuY29kaW5nLmlzRW1w dHkoKSkKICAgICAgICAgbV9yZXNwb25zZUVuY29kaW5nID0gcmVzcG9uc2UudGV4dEVuY29kaW5n TmFtZSgpOwogfQo= 166665 2012-10-02 04:35:27 -0700 2012-10-02 05:46:27 -0700 Patch 98137_overrideMimeType.patch text/plain 5077 cdumez ZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL0NoYW5nZUxvZyBiL0xheW91dFRlc3RzL0NoYW5nZUxv ZwppbmRleCBlM2EyMmJmLi5mOWQyYzcxIDEwMDY0NAotLS0gYS9MYXlvdXRUZXN0cy9DaGFuZ2VM b2cKKysrIGIvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMTAt MDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3RvcGhlLmR1bWV6QGludGVsLmNvbT4KKworICAg ICAgICBbWE1MSHR0cFJlcXVlc3RdIG92ZXJyaWRlTWltZVR5cGUobWltZSkgZG9lcyBub3QgdXBk YXRlIHRoZSByZXNwb25zZSdzICJDb250ZW50LVR5cGUiIGhlYWRlcgorICAgICAgICBodHRwczov L2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTgxMzcKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgbGF5b3V0IHRlc3QgdG8gY2hlY2sg dGhhdCBjYWxsaW5nIG92ZXJyaWRlTWltZVR5cGUobWltZSkgcHJvcGVybHkKKyAgICAgICAgc2V0 cyB0aGUgcmVzcG9uc2UncyAiQ29udGVudC1UeXBlIiBoZWFkZXIgdG8gbWltZS4KKworICAgICAg ICAqIGh0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1l dHlwZS1jb250ZW50LXR5cGUtaGVhZGVyLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog aHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1vdmVycmlkZW1pbWV0eXBl LWNvbnRlbnQtdHlwZS1oZWFkZXIuaHRtbDogQWRkZWQuCisKIDIwMTItMTAtMDIgIEtlaXNoaSBI YXR0b3JpICA8a2Vpc2hpQHdlYmtpdC5vcmc+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogTW9k aWZpY2F0aW9ucyBpbiBhIHNoYWRvdyB0cmVlIGRvbid0IHVwZGF0ZSB0aGUgRWxlbWVudHMgcGFu ZWwuCmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3ht bGh0dHByZXF1ZXN0LW92ZXJyaWRlbWltZXR5cGUtY29udGVudC10eXBlLWhlYWRlci1leHBlY3Rl ZC50eHQgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1 ZXN0LW92ZXJyaWRlbWltZXR5cGUtY29udGVudC10eXBlLWhlYWRlci1leHBlY3RlZC50eHQKbmV3 IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMC4uMGZiZTFlOAotLS0gL2Rldi9udWxsCisr KyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qt b3ZlcnJpZGVtaW1ldHlwZS1jb250ZW50LXR5cGUtaGVhZGVyLWV4cGVjdGVkLnR4dApAQCAtMCww ICsxLDEwIEBACitUaGlzIHRlc3RzIHRoYXQgWE1MSHR0cFJlcXVlc3Qgb3ZlcnJpZGVNaW1lVHlw ZSgpIHByb3Blcmx5IHVwZGF0ZXMgdGhlIENvbnRlbnQtVHlwZSBoZWFkZXIgZm9yIHRoZSByZXNw b25zZS4KKworT24gc3VjY2VzcywgeW91IHdpbGwgc2VlIGEgc2VyaWVzIG9mICJQQVNTIiBtZXNz YWdlcywgZm9sbG93ZWQgYnkgIlRFU1QgQ09NUExFVEUiLgorCisKK1BBU1MgeGhyLmdldFJlc3Bv bnNlSGVhZGVyKCJDb250ZW50LVR5cGUiKSBpcyAidGV4dC94bWw7Y2hhcnNldD1HQksiCitQQVNT IHN1Y2Nlc3NmdWxseVBhcnNlZCBpcyB0cnVlCisKK1RFU1QgQ09NUExFVEUKKwpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy94bWxodHRwcmVxdWVzdC94bWxodHRwcmVxdWVzdC1v dmVycmlkZW1pbWV0eXBlLWNvbnRlbnQtdHlwZS1oZWFkZXIuaHRtbCBiL0xheW91dFRlc3RzL2h0 dHAvdGVzdHMveG1saHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1ldHlwZS1j b250ZW50LXR5cGUtaGVhZGVyLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MC4uOWMyYjk2OAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMveG1s aHR0cHJlcXVlc3QveG1saHR0cHJlcXVlc3Qtb3ZlcnJpZGVtaW1ldHlwZS1jb250ZW50LXR5cGUt aGVhZGVyLmh0bWwKQEAgLTAsMCArMSwzMiBAQAorPCFET0NUWVBFIGh0bWw+Cis8aHRtbD4KKzxo ZWFkPgorICAgIDxzY3JpcHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMi Pjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+CisgICAgPHNjcmlwdD4KKyAgICAgICAgZGVzY3Jp cHRpb24oJ1RoaXMgdGVzdHMgdGhhdCBYTUxIdHRwUmVxdWVzdCBvdmVycmlkZU1pbWVUeXBlKCkg cHJvcGVybHkgdXBkYXRlcyB0aGUgQ29udGVudC1UeXBlIGhlYWRlciBmb3IgdGhlIHJlc3BvbnNl LicpOworICAgICAgICB3aW5kb3cuanNUZXN0SXNBc3luYyA9IHRydWU7CisKKyAgICAgICAgdmFy IHhociA9IG5ldyBYTUxIdHRwUmVxdWVzdCgpOworICAgICAgICB2YXIgdXJsID0gJ3Jlc291cmNl cy9yZXBseS54bWwnOworCisgICAgICAgIHhoci5vbnJlYWR5c3RhdGVjaGFuZ2UgPSBmdW5jdGlv biAoKSB7CisgICAgICAgICAgICBpZiAoeGhyLnJlYWR5U3RhdGUgPT0geGhyLkxPQURJTkcpIHsK KyAgICAgICAgICAgICAgICBzaG91bGRCZSgneGhyLmdldFJlc3BvbnNlSGVhZGVyKCJDb250ZW50 LVR5cGUiKScsICcidGV4dC94bWw7Y2hhcnNldD1HQksiJyk7CisgICAgICAgICAgICAgICAgZmlu aXNoSlNUZXN0KCk7CisgICAgICAgICAgICB9CisgICAgICAgIH0KKworICAgICAgICB4aHIub25l cnJvciA9IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgdGVzdEZhaWxlZCgnVGhlIFhIUiByZXF1 ZXN0IHRvIGFuIGV4aXN0aW5nIHJlc291cmNlIGZhaWxlZDogIicgKyB1cmwgKyAnIicpOworICAg ICAgICAgICAgZmluaXNoSlNUZXN0KCk7CisgICAgICAgIH07CisKKyAgICAgICAgeGhyLm9wZW4o J0dFVCcsIHVybCk7CisgICAgICAgIHhoci5vdmVycmlkZU1pbWVUeXBlKCd0ZXh0L3htbDtjaGFy c2V0PUdCSycpOworICAgICAgICB4aHIuc2VuZCgpOworICAgIDwvc2NyaXB0PgorICAgIDxzY3Jp cHQgc3JjPSIvanMtdGVzdC1yZXNvdXJjZXMvanMtdGVzdC1wb3N0LmpzIj48L3NjcmlwdD4KKzwv Ym9keT4KKzwvaHRtbD4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCA4MDZlY2Q4Li41ZDZlZTQ0IDEwMDY0NAotLS0g YS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9n CkBAIC0xLDMgKzEsMjIgQEAKKzIwMTItMTAtMDIgIENocmlzdG9waGUgRHVtZXogIDxjaHJpc3Rv cGhlLmR1bWV6QGludGVsLmNvbT4KKworICAgICAgICBbWE1MSHR0cFJlcXVlc3RdIG92ZXJyaWRl TWltZVR5cGUobWltZSkgZG9lcyBub3QgdXBkYXRlIHRoZSByZXNwb25zZSdzICJDb250ZW50LVR5 cGUiIGhlYWRlcgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9OTgxMzcKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAg ICBBY2NvcmRpbmcgdG8gdGhlIFhNTEh0dHBSZXF1ZXN0IHNwZWNpZmljYXRpb24sIG92ZXJyaWRl TWltZVR5cGUobWltZSkgc2V0cyB0aGUKKyAgICAgICAgIkNvbnRlbnQtVHlwZSIgaGVhZGVyIGZv ciB0aGUgcmVzcG9uc2UgdG8gbWltZS4gSG93ZXZlciwgd2l0aCB0aGUgY3VycmVudAorICAgICAg ICBpbXBsZW1lbnRhdGlvbiwgY2FsbGluZyBvdmVycmlkZU1pbWVUeXBlKG1pbWUpIGRvZXMgbm90 IGFmZmVjdCB0aGUgdmFsdWUKKyAgICAgICAgcmV0dXJuZWQgYnkgY2xpZW50LmdldFJlc3BvbnNl SGVhZGVyKCJDb250ZW50LVR5cGUiKS4gVGhpcyBwYXRjaCBtYWtlcyBzdXJlCisgICAgICAgIHRo ZSByZXNwb25zZSdzICJDb250ZW50LVR5cGUiIGhlYWRlciBpcyBwcm9wZXJseSB1cGRhdGVkIHdp dGggdGhlIG92ZXJyaWRlCisgICAgICAgIE1JTUUgdHlwZS4KKworICAgICAgICBUZXN0OiBodHRw L3Rlc3RzL3htbGh0dHByZXF1ZXN0L3htbGh0dHByZXF1ZXN0LW92ZXJyaWRlbWltZXR5cGUtY29u dGVudC10eXBlLWhlYWRlci5odG1sCisKKyAgICAgICAgKiB4bWwvWE1MSHR0cFJlcXVlc3QuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6WE1MSHR0cFJlcXVlc3Q6OmRpZFJlY2VpdmVSZXNwb25zZSk6 CisKIDIwMTItMTAtMDIgIE5pa2l0YSBWYXNpbHlldiAgPG1lQGVsdjFzLnJ1PgogCiAgICAgICAg IFdlYiBJbnNwZWN0b3I6IENTUyBwcm9wZXJ0eSBuYW1lcyBhdXRvY29tcGxldGU6IFN1Z2dlc3Qg bW9zdCB1c2VkIHJhdGhlciB0aGFuIGFscGhhYmV0aWNhbHkgZmlyc3QKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS94bWwv WE1MSHR0cFJlcXVlc3QuY3BwCmluZGV4IDA5N2JjNDQuLmVlNmYyOGMgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJDb3JlL3htbC9YTUxIdHRwUmVxdWVzdC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUv eG1sL1hNTEh0dHBSZXF1ZXN0LmNwcApAQCAtMTExNiw3ICsxMTE2LDExIEBAIHZvaWQgWE1MSHR0 cFJlcXVlc3Q6OmRpZFJlY2VpdmVSZXNwb25zZSh1bnNpZ25lZCBsb25nIGlkZW50aWZpZXIsIGNv bnN0IFJlc291cmNlCiAgICAgSW5zcGVjdG9ySW5zdHJ1bWVudGF0aW9uOjpkaWRSZWNlaXZlWEhS UmVzcG9uc2Uoc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpLCBpZGVudGlmaWVyKTsKIAogICAgIG1f cmVzcG9uc2UgPSByZXNwb25zZTsKLSAgICBtX3Jlc3BvbnNlRW5jb2RpbmcgPSBleHRyYWN0Q2hh cnNldEZyb21NZWRpYVR5cGUobV9taW1lVHlwZU92ZXJyaWRlKTsKKyAgICBpZiAoIW1fbWltZVR5 cGVPdmVycmlkZS5pc0VtcHR5KCkpIHsKKyAgICAgICAgbV9yZXNwb25zZS5zZXRIVFRQSGVhZGVy RmllbGQoIkNvbnRlbnQtVHlwZSIsIG1fbWltZVR5cGVPdmVycmlkZSk7CisgICAgICAgIG1fcmVz cG9uc2VFbmNvZGluZyA9IGV4dHJhY3RDaGFyc2V0RnJvbU1lZGlhVHlwZShtX21pbWVUeXBlT3Zl cnJpZGUpOworICAgIH0KKwogICAgIGlmIChtX3Jlc3BvbnNlRW5jb2RpbmcuaXNFbXB0eSgpKQog ICAgICAgICBtX3Jlc3BvbnNlRW5jb2RpbmcgPSByZXNwb25zZS50ZXh0RW5jb2RpbmdOYW1lKCk7 CiB9Cg==