From d3dfdf0c699d139967276905a1134467bdfff9d6 Mon Sep 17 00:00:00 2001
From: "carlosgc@webkit.org"
 <carlosgc@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed, 19 Sep 2018 13:19:07 +0000
Subject: [PATCH] Merge r235844 - XMLHttpRequest: overrideMimeType should not
 update the response's "Content-Type" header
 https://bugs.webkit.org/show_bug.cgi?id=189465
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Patch by Rob Buis <rbuis@igalia.com> on 2018-09-10
Reviewed by Frédéric Wang.

LayoutTests/imported/w3c:

* web-platform-tests/xhr/overridemimetype-invalid-mime-type-expected.txt:

Source/WebCore:

The xhr spec changed [1, 2] so that overrideMimeType should not update the
response's "Content-Type" header anymore.

Behavior matches Firefox and Chrome.

[1] https://xhr.spec.whatwg.org/#dom-xmlhttprequest-overridemimetype
[2] https://github.com/whatwg/xhr/issues/157

Tests: http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html
       web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm

* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::didReceiveResponse):

LayoutTests:

Change existing test to reflect new behavior.

* http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt:
* http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html:

git-svn-id: http://svn.webkit.org/repository/webkit/releases/WebKitGTK/webkit-2.22@236185 268f45cc-cd09-0410-ab3c-d52691b4dbfc
---
 LayoutTests/ChangeLog                         | 12 +++++++++++
 ...emimetype-content-type-header-expected.txt |  4 ++--
 ...-overridemimetype-content-type-header.html |  4 ++--
 LayoutTests/imported/w3c/ChangeLog            |  9 ++++++++
 ...idemimetype-invalid-mime-type-expected.txt |  4 ++--
 Source/WebCore/ChangeLog                      | 21 +++++++++++++++++++
 Source/WebCore/xml/XMLHttpRequest.cpp         |  3 ---
 7 files changed, 48 insertions(+), 9 deletions(-)

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 90aeaae789912..39b3b01499446 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,15 @@
+2018-09-10  Rob Buis  <rbuis@igalia.com>
+
+        XMLHttpRequest: overrideMimeType should not update the response's "Content-Type" header
+        https://bugs.webkit.org/show_bug.cgi?id=189465
+
+        Reviewed by Frédéric Wang.
+
+        Change existing test to reflect new behavior.
+
+        * http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt:
+        * http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html:
+
 2018-09-10  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Interrupting an accelerated CSS transition on a composited element in flight fails
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt
index 0fbe1e8843226..880b205f89c2b 100644
--- a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header-expected.txt
@@ -1,9 +1,9 @@
-This tests that XMLHttpRequest overrideMimeType() properly updates the Content-Type header for the response.
+This tests that XMLHttpRequest overrideMimeType() does not update the Content-Type header for the response.
 
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS xhr.getResponseHeader("Content-Type") is "text/xml;charset=GBK"
+PASS xhr.getResponseHeader("Content-Type") is "application/xml"
 PASS successfullyParsed is true
 
 TEST COMPLETE
diff --git a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html
index 9c2b96883cfbc..04add7a5d82b7 100644
--- a/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html
+++ b/LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html
@@ -5,7 +5,7 @@
 </head>
 <body>
     <script>
-        description('This tests that XMLHttpRequest overrideMimeType() properly updates the Content-Type header for the response.');
+        description('This tests that XMLHttpRequest overrideMimeType() does not update the Content-Type header for the response.');
         window.jsTestIsAsync = true;
 
         var xhr = new XMLHttpRequest();
@@ -13,7 +13,7 @@
 
         xhr.onreadystatechange = function () {
             if (xhr.readyState == xhr.LOADING) {
-                shouldBe('xhr.getResponseHeader("Content-Type")', '"text/xml;charset=GBK"');
+                shouldBe('xhr.getResponseHeader("Content-Type")', '"application/xml"');
                 finishJSTest();
             }
         }
diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
index d4c1f17d29a48..343cb409f35da 100644
--- a/LayoutTests/imported/w3c/ChangeLog
+++ b/LayoutTests/imported/w3c/ChangeLog
@@ -1,3 +1,12 @@
+2018-09-10  Rob Buis  <rbuis@igalia.com>
+
+        XMLHttpRequest: overrideMimeType should not update the response's "Content-Type" header
+        https://bugs.webkit.org/show_bug.cgi?id=189465
+
+        Reviewed by Frédéric Wang.
+
+        * web-platform-tests/xhr/overridemimetype-invalid-mime-type-expected.txt:
+
 2018-09-12  Chris Dumez  <cdumez@apple.com>
 
         Unreviewed, rebaseline imported/w3c/web-platform-tests/url/failure.html after r235808.
diff --git a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt
index b043d7e2e7872..5758656fb3d96 100644
--- a/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt
+++ b/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/overridemimetype-invalid-mime-type-expected.txt
@@ -1,5 +1,5 @@
 
-FAIL Bogus MIME type does not override encoding assert_equals: expected "text/html;charset=windows-1252" but got "bogus"
+PASS Bogus MIME type does not override encoding 
 FAIL Bogus MIME type does not override encoding, 2 assert_equals: expected "ÿ" but got "\x1a"
-FAIL Bogus MIME type does override MIME type assert_equals: expected "text/xml" but got "bogus"
+PASS Bogus MIME type does override MIME type 
 
diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index 5f4a6323cc239..47271b39cea36 100644
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,24 @@
+2018-09-10  Rob Buis  <rbuis@igalia.com>
+
+        XMLHttpRequest: overrideMimeType should not update the response's "Content-Type" header
+        https://bugs.webkit.org/show_bug.cgi?id=189465
+
+        Reviewed by Frédéric Wang.
+
+        The xhr spec changed [1, 2] so that overrideMimeType should not update the
+        response's "Content-Type" header anymore.
+
+        Behavior matches Firefox and Chrome.
+
+        [1] https://xhr.spec.whatwg.org/#dom-xmlhttprequest-overridemimetype
+        [2] https://github.com/whatwg/xhr/issues/157
+
+        Tests: http/tests/xmlhttprequest/xmlhttprequest-overridemimetype-content-type-header.html
+               web-platform-tests/xhr/overridemimetype-invalid-mime-type.htm
+
+        * xml/XMLHttpRequest.cpp:
+        (WebCore::XMLHttpRequest::didReceiveResponse):
+
 2018-09-10  Antoine Quint  <graouts@apple.com>
 
         [Web Animations] Interrupting an accelerated CSS transition on a composited element in flight fails
diff --git a/Source/WebCore/xml/XMLHttpRequest.cpp b/Source/WebCore/xml/XMLHttpRequest.cpp
index a813766ff1be9..faaae6175b7c5 100644
--- a/Source/WebCore/xml/XMLHttpRequest.cpp
+++ b/Source/WebCore/xml/XMLHttpRequest.cpp
@@ -966,8 +966,6 @@ void XMLHttpRequest::didSendData(unsigned long long bytesSent, unsigned long lon
 void XMLHttpRequest::didReceiveResponse(unsigned long, const ResourceResponse& response)
 {
     m_response = response;
-    if (!m_mimeTypeOverride.isEmpty())
-        m_response.setHTTPHeaderField(HTTPHeaderName::ContentType, m_mimeTypeOverride);
 }
 
 static inline bool shouldDecodeResponse(XMLHttpRequest::ResponseType type)
@@ -1027,7 +1025,6 @@ void XMLHttpRequest::didReceiveData(const char* data, int len)
     if (readyState() < HEADERS_RECEIVED)
         changeState(HEADERS_RECEIVED);
 
-    // FIXME: Should we update "Content-Type" header field with m_mimeTypeOverride value in case it has changed since didReceiveResponse?
     if (!m_mimeTypeOverride.isEmpty())
         m_responseEncoding = extractCharsetFromMediaType(m_mimeTypeOverride);
     if (m_responseEncoding.isEmpty())