Title: [213766] trunk
Revision
213766
Author
[email protected]
Date
2017-03-11 22:07:05 -0800 (Sat, 11 Mar 2017)

Log Message

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

Patch by Youenn Fablet <[email protected]> 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:

Modified Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (213765 => 213766)


--- trunk/LayoutTests/ChangeLog	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/ChangeLog	2017-03-12 06:07:05 UTC (rev 213766)
@@ -1,3 +1,14 @@
+2017-03-11  Youenn Fablet  <[email protected]>
+
+        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  <[email protected]>
 
         Percentage constrained images shrinking inside blocks inside nested flex boxes

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt (213765 => 213766)


--- trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt	2017-03-12 06:07:05 UTC (rev 213766)
@@ -5,8 +5,8 @@
 
 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) 
 PASS XMLHttpRequest: setRequestHeader() - combining headers (If) 

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html (213765 => 213766)


--- trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html	2017-03-12 06:07:05 UTC (rev 213766)
@@ -17,9 +17,9 @@
           client.setRequestHeader(header, "t2")
           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 + ")")
       }
       request("Authorization")

Modified: trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html (213765 => 213766)


--- trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html	2017-03-12 06:07:05 UTC (rev 213766)
@@ -19,7 +19,7 @@
    r.setRequestHeader('X-Test-Header', 'ONE');
    r.setRequestHeader('X-Test-Header', 'TWO');
    r.send(null);
-   if (r.responseText == 'RESULT:[ONE,TWO]') {
+   if (r.responseText == 'RESULT:[ONE, TWO]') {
      p.firstChild.data = '';
    } else {
      p.firstChild.data = '' + r.responseText + ')';

Modified: trunk/LayoutTests/imported/w3c/ChangeLog (213765 => 213766)


--- trunk/LayoutTests/imported/w3c/ChangeLog	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/imported/w3c/ChangeLog	2017-03-12 06:07:05 UTC (rev 213766)
@@ -1,3 +1,14 @@
+2017-03-11  Youenn Fablet  <[email protected]>
+
+        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  <[email protected]>
 
         imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html is unreliable

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm (213765 => 213766)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm	2017-03-12 06:07:05 UTC (rev 213766)
@@ -11,7 +11,7 @@
     <script>
       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")
         client.setRequestHeader("X-teST", "t3")

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm (213765 => 213766)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm	2017-03-12 06:07:05 UTC (rev 213766)
@@ -12,7 +12,7 @@
       function request(header) {
         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")
           client.send(null)

Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html (213765 => 213766)


--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html	2017-03-12 06:07:05 UTC (rev 213766)
@@ -18,8 +18,8 @@
                               ["triple", "tripleValue3"]
       ];
       var expectedDict = {"single": "singleValue",
-                          "double": "doubleValue1,doubleValue2",
-                          "triple": "tripleValue1,tripleValue2,tripleValue3"
+                          "double": "doubleValue1, doubleValue2",
+                          "triple": "tripleValue1, tripleValue2, tripleValue3"
       };
 
       test(function() {
@@ -51,7 +51,7 @@
         for (name in expectedDict) {
           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));
         }
       }, "Check append methods when called with already used name");

Modified: trunk/Source/WebCore/ChangeLog (213765 => 213766)


--- trunk/Source/WebCore/ChangeLog	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/Source/WebCore/ChangeLog	2017-03-12 06:07:05 UTC (rev 213766)
@@ -1,3 +1,15 @@
+2017-03-11  Youenn Fablet  <[email protected]>
+
+        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  <[email protected]>
 
         Enable async image decoding for large images

Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (213765 => 213766)


--- trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp	2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp	2017-03-12 06:07:05 UTC (rev 213766)
@@ -97,7 +97,7 @@
     if (!findHTTPHeaderName(name, headerName)) {
         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;
     }
     add(headerName, value);
@@ -148,7 +148,7 @@
 {
     auto result = m_commonHeaders.add(name, value);
     if (!result.isNewEntry)
-        result.iterator->value = result.iterator->value + ',' + value;
+        result.iterator->value = result.iterator->value + ", " + value;
 }
 
 } // namespace WebCore
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to