<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[213766] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/213766">213766</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2017-03-11 22:07:05 -0800 (Sat, 11 Mar 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>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:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestcheckcombiningheadersexpectedtxt">trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestcheckcombiningheadershtml">trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html</a></li>
<li><a href="#trunkLayoutTestshttptestsxmlhttprequestwebapps005html">trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheadercaseinsensitivehtm">trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheaderheaderallowedhtm">trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheaderscombinehtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp">trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2017-03-12 05:02:25 UTC (rev 213765)
+++ trunk/LayoutTests/ChangeLog 2017-03-12 06:07:05 UTC (rev 213766)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-03-10 Dave Hyatt <hyatt@apple.com>
</span><span class="cx">
</span><span class="cx"> Percentage constrained images shrinking inside blocks inside nested flex boxes
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestcheckcombiningheadersexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers-expected.txt (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -5,8 +5,8 @@
</span><span class="cx">
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - combining headers (Authorization)
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - combining headers (Pragma)
</span><del>-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
</del><ins>+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
</ins><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - combining headers (Content-Type)
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - combining headers (Overwrite)
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - combining headers (If)
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestcheckcombiningheadershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/check-combining-headers.html (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -17,9 +17,9 @@
</span><span class="cx"> client.setRequestHeader(header, "t2")
</span><span class="cx"> client.send(null)
</span><span class="cx"> if (!doNotshowFullValueInError)
</span><del>- assert_equals(JSON.parse(client.response)[header.toLowerCase()], "t1,t2", "Combined header value should be t1,t2")
</del><ins>+ assert_equals(JSON.parse(client.response)[header.toLowerCase()], "t1, t2", "Combined header value should be t1, t2")
</ins><span class="cx"> else
</span><del>- assert_true(JSON.parse(client.response)[header.toLowerCase()] == "t1,t2", "Combined header value should be t1,t2")
</del><ins>+ assert_true(JSON.parse(client.response)[header.toLowerCase()] == "t1, t2", "Combined header value should be t1, t2")
</ins><span class="cx"> }, document.title + " (" + header + ")")
</span><span class="cx"> }
</span><span class="cx"> request("Authorization")
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsxmlhttprequestwebapps005html"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/xmlhttprequest/web-apps/005.html (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> r.setRequestHeader('X-Test-Header', 'ONE');
</span><span class="cx"> r.setRequestHeader('X-Test-Header', 'TWO');
</span><span class="cx"> r.send(null);
</span><del>- if (r.responseText == 'RESULT:[ONE,TWO]') {
</del><ins>+ if (r.responseText == 'RESULT:[ONE, TWO]') {
</ins><span class="cx"> p.firstChild.data = 'PASS';
</span><span class="cx"> } else {
</span><span class="cx"> p.firstChild.data = 'FAIL (' + r.responseText + ')';
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,14 @@
</span><ins>+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:
+
</ins><span class="cx"> 2017-03-10 Antti Koivisto <antti@apple.com>
</span><span class="cx">
</span><span class="cx"> imported/w3c/web-platform-tests/html/semantics/embedded-content/the-img-element/sizes/parse-a-sizes-attribute.html is unreliable
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheadercaseinsensitivehtm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-case-insensitive.htm (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> <script>
</span><span class="cx"> test(function() {
</span><span class="cx"> var client = new XMLHttpRequest()
</span><del>- client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2,t3", false)
</del><ins>+ client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2, t3", false)
</ins><span class="cx"> client.setRequestHeader("x-test", "t1")
</span><span class="cx"> client.setRequestHeader("X-TEST", "t2")
</span><span class="cx"> client.setRequestHeader("X-teST", "t3")
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheaderheaderallowedhtm"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-header-allowed.htm (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -12,7 +12,7 @@
</span><span class="cx"> function request(header) {
</span><span class="cx"> test(function() {
</span><span class="cx"> var client = new XMLHttpRequest()
</span><del>- client.open("POST", "resources/inspect-headers.py?filter_value=t1,t2", false)
</del><ins>+ client.open("POST", "resources/inspect-headers.py?filter_value=t1, t2", false)
</ins><span class="cx"> client.setRequestHeader(header, "t1")
</span><span class="cx"> client.setRequestHeader(header, "t2")
</span><span class="cx"> client.send(null)
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapiheadersheaderscombinehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/headers/headers-combine.html (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> ["triple", "tripleValue3"]
</span><span class="cx"> ];
</span><span class="cx"> var expectedDict = {"single": "singleValue",
</span><del>- "double": "doubleValue1,doubleValue2",
- "triple": "tripleValue1,tripleValue2,tripleValue3"
</del><ins>+ "double": "doubleValue1, doubleValue2",
+ "triple": "tripleValue1, tripleValue2, tripleValue3"
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> test(function() {
</span><span class="lines">@@ -51,7 +51,7 @@
</span><span class="cx"> for (name in expectedDict) {
</span><span class="cx"> var value = headers.get(name);
</span><span class="cx"> headers.append(name,"newSingleValue");
</span><del>- assert_equals(headers.get(name), (value + "," + "newSingleValue"),
</del><ins>+ assert_equals(headers.get(name), (value + ", " + "newSingleValue"),
</ins><span class="cx"> "name: " + name + " has value: " + headers.get(name));
</span><span class="cx"> }
</span><span class="cx"> }, "Check append methods when called with already used name");
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -1,3 +1,15 @@
</span><ins>+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 ', '.
+
</ins><span class="cx"> 2017-03-11 Said Abou-Hallawa <sabouhallawa@apple.com>
</span><span class="cx">
</span><span class="cx"> Enable async image decoding for large images
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkHTTPHeaderMapcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/HTTPHeaderMap.cpp (213765 => 213766)</h4>
<pre class="diff"><span>
<span class="info">--- 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)
</span><span class="lines">@@ -97,7 +97,7 @@
</span><span class="cx"> if (!findHTTPHeaderName(name, headerName)) {
</span><span class="cx"> auto result = m_uncommonHeaders.add(name, value);
</span><span class="cx"> if (!result.isNewEntry)
</span><del>- result.iterator->value = result.iterator->value + ',' + value;
</del><ins>+ result.iterator->value = result.iterator->value + ", " + value;
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> add(headerName, value);
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> {
</span><span class="cx"> auto result = m_commonHeaders.add(name, value);
</span><span class="cx"> if (!result.isNewEntry)
</span><del>- result.iterator->value = result.iterator->value + ',' + value;
</del><ins>+ result.iterator->value = result.iterator->value + ", " + value;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre>
</div>
</div>
</body>
</html>