Changeset 213766 in webkit

Timestamp:

Mar 11, 2017 10:07:05 PM (7 years ago)

Author:

commit-queue@webkit.org

Message:

XMLHttpRequest: make setRequestHeader() use , as separator (including a space)
​https://bugs.webkit.org/show_bug.cgi?id=169285

Patch by Youenn Fablet <​youenn@apple.com> on 2017-03-11
Reviewed by Sam Weinig.

LayoutTests/imported/w3c:

• web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm:
• web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm:
• web-platform-tests/fetch/api/headers/headers-combine.html:

Source/WebCore:

Covered by updated tests.

• platform/network/HTTPHeaderMap.cpp:

(WebCore::HTTPHeaderMap::add): Reverting back to ', '.

LayoutTests:

• http/tests/xmlhttprequest/check-combining-headers-expected.txt:
• http/tests/xmlhttprequest/check-combining-headers.html:
• http/tests/xmlhttprequest/web-apps/005.html:

Location:

trunk

Files:

• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html (modified) (1 diff)
• LayoutTests/http/tests/xmlhttprequest/web-apps/005.html (modified) (1 diff)
• LayoutTests/imported/w3c/ChangeLog (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm (modified) (1 diff)
• LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html (modified) (2 diffs)
• Source/WebCore/ChangeLog (modified) (1 diff)
• Source/WebCore/platform/network/HTTPHeaderMap.cpp (modified) (2 diffs)

trunk/LayoutTests/ChangeLog

@@ +1 @@
+2017-03-11  Youenn Fablet  <youenn@apple.com>
+
+        XMLHttpRequest: make setRequestHeader() use `, ` as separator (including a space)
+        https://bugs.webkit.org/show_bug.cgi?id=169285
+
+        Reviewed by Sam Weinig.
+
+        * http/tests/xmlhttprequest/check-combining-headers-expected.txt:
+        * http/tests/xmlhttprequest/check-combining-headers.html:
+        * http/tests/xmlhttprequest/web-apps/005.html:
+
 2017-03-10  Dave Hyatt  <hyatt@apple.com>
 

trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt

@@ -6 +6 @@
 PASS XMLHttpRequest: setRequestHeader() - combining headers (Authorization) 
 PASS XMLHttpRequest: setRequestHeader() - combining headers (Pragma) 
-FAIL XMLHttpRequest: setRequestHeader() - combining headers (User-Agent) assert_true: Combined header value should be t1,t2 expected true got false
-FAIL XMLHttpRequest: setRequestHeader() - combining headers (Content-Transfer-Encoding) assert_equals: Combined header value should be t1,t2 expected (string) "t1,t2" but got (undefined) undefined
+FAIL XMLHttpRequest: setRequestHeader() - combining headers (User-Agent) assert_true: Combined header value should be t1, t2 expected true got false
+FAIL XMLHttpRequest: setRequestHeader() - combining headers (Content-Transfer-Encoding) assert_equals: Combined header value should be t1, t2 expected (string) "t1, t2" but got (undefined) undefined
 PASS XMLHttpRequest: setRequestHeader() - combining headers (Content-Type) 
 PASS XMLHttpRequest: setRequestHeader() - combining headers (Overwrite) 

trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html

@@ -18 +18 @@
           client.send(null)
           if (!doNotshowFullValueInError)
-              assert_equals(JSON.parse(client.response)[header.toLowerCase()], "t1,t2", "Combined header value should be t1,t2")
+              assert_equals(JSON.parse(client.response)[header.toLowerCase()], "t1, t2", "Combined header value should be t1, t2")
           else
-              assert_true(JSON.parse(client.response)[header.toLowerCase()] == "t1,t2", "Combined header value should be t1,t2")
+              assert_true(JSON.parse(client.response)[header.toLowerCase()] == "t1, t2", "Combined header value should be t1, t2")
         }, document.title + " (" + header + ")")
       }

trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html

@@ -20 +20 @@
    r.setRequestHeader('X-Test-Header', 'TWO');
    r.send(null);
-   if (r.responseText == 'RESULT:[ONE,TWO]') {
+   if (r.responseText == 'RESULT:[ONE, TWO]') {
      p.firstChild.data = 'PASS';
    } else {

trunk/LayoutTests/imported/w3c/ChangeLog

@@ +1 @@
+2017-03-11  Youenn Fablet  <youenn@apple.com>
+
+        XMLHttpRequest: make setRequestHeader() use `, ` as separator (including a space)
+        https://bugs.webkit.org/show_bug.cgi?id=169285
+
+        Reviewed by Sam Weinig.
+
+        * web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm:
+        * web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm:
+        * web-platform-tests/fetch/api/headers/headers-combine.html:
+
 2017-03-10  Antti Koivisto  <antti@apple.com>
 

trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm

@@ -12 +12 @@
       test(function() {
         var client = new XMLHttpRequest()
-        client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2,t3", false)
+        client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2, t3", false)
         client.setRequestHeader("x-test", "t1")
         client.setRequestHeader("X-TEST", "t2")

trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm

@@ -13 +13 @@
         test(function() {
           var client = new XMLHttpRequest()
-          client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2", false)
+          client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2", false)
           client.setRequestHeader(header, "t1")
           client.setRequestHeader(header, "t2")

trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html

@@ -19 +19 @@
       ];
       var expectedDict = {"single": "singleValue",
-                          "double": "doubleValue1,doubleValue2",
-                          "triple": "tripleValue1,tripleValue2,tripleValue3"
+                          "double": "doubleValue1, doubleValue2",
+                          "triple": "tripleValue1, tripleValue2, tripleValue3"
       };
 
@@ -52 +52 @@
           var value = headers.get(name);
           headers.append(name,"newSingleValue");
-          assert_equals(headers.get(name), (value + "," + "newSingleValue"),
+          assert_equals(headers.get(name), (value + ", " + "newSingleValue"),
             "name: " + name + " has value: " + headers.get(name));
         }

trunk/Source/WebCore/ChangeLog

@@ +1 @@
+2017-03-11  Youenn Fablet  <youenn@apple.com>
+
+        XMLHttpRequest: make setRequestHeader() use `, ` as separator (including a space)
+        https://bugs.webkit.org/show_bug.cgi?id=169285
+
+        Reviewed by Sam Weinig.
+
+        Covered by updated tests.
+
+        * platform/network/HTTPHeaderMap.cpp:
+        (WebCore::HTTPHeaderMap::add): Reverting back to ', '.
+
 2017-03-11  Said Abou-Hallawa  <sabouhallawa@apple.com>
 

trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp

@@ -98 +98 @@
         auto result = m_uncommonHeaders.add(name, value);
         if (!result.isNewEntry)
-            result.iterator->value = result.iterator->value + ',' + value;
+            result.iterator->value = result.iterator->value + ", " + value;
         return;
     }
@@ -149 +149 @@
     auto result = m_commonHeaders.add(name, value);
     if (!result.isNewEntry)
-        result.iterator->value = result.iterator->value + ',' + value;
+        result.iterator->value = result.iterator->value + ", " + value;
 }