<!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>[192620] 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/192620">192620</a></dd>
<dt>Author</dt> <dd>youenn.fablet@crf.canon.fr</dd>
<dt>Date</dt> <dd>2015-11-19 01:14:36 -0800 (Thu, 19 Nov 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>XHR should not combine empty content-type value with default one
https://bugs.webkit.org/show_bug.cgi?id=147784
Reviewed by Darin Adler.
LayoutTests/imported/w3c:
* web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt:
Source/WebCore:
Previously, XHR was testing whether a "Content-Type" was set using setRequestHeader by checking whether a "Content-Type" header value was empty.
This now tests whether "Content-Type" request header is set using either HTTPHeaderMap::contains or checking whether a "Content-Type" header value is null.
Test: http/tests/xmlhttprequest/post-empty-content-type.html
* xml/XMLHttpRequest.cpp:
(WebCore::XMLHttpRequest::send):</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheadercontenttypeexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCorexmlXMLHttpRequestcpp">trunk/Source/WebCore/xml/XMLHttpRequest.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (192619 => 192620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2015-11-19 08:38:17 UTC (rev 192619)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2015-11-19 09:14:36 UTC (rev 192620)
</span><span class="lines">@@ -1,3 +1,12 @@
</span><ins>+2015-11-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ XHR should not combine empty content-type value with default one
+ https://bugs.webkit.org/show_bug.cgi?id=147784
+
+ Reviewed by Darin Adler.
+
+ * web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt:
+
</ins><span class="cx"> 2015-11-16 Youenn Fablet <youenn.fablet@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> Follow-up of https://bugs.webkit.org/show_bug.cgi?id=151190
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsXMLHttpRequestsetrequestheadercontenttypeexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt (192619 => 192620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt 2015-11-19 08:38:17 UTC (rev 192619)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/XMLHttpRequest/setrequestheader-content-type-expected.txt 2015-11-19 09:14:36 UTC (rev 192620)
</span><span class="lines">@@ -1,6 +1,6 @@
</span><span class="cx">
</span><del>-FAIL XMLHttpRequest: setRequestHeader() - Content-Type header () assert_equals: expected "content-type: \n" but got "content-type: , text/plain;charset=UTF-8\n"
-FAIL XMLHttpRequest: setRequestHeader() - Content-Type header ( ) assert_equals: expected "content-type: \n" but got "content-type: , text/plain;charset=UTF-8\n"
</del><ins>+PASS XMLHttpRequest: setRequestHeader() - Content-Type header ()
+PASS XMLHttpRequest: setRequestHeader() - Content-Type header ( )
</ins><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - Content-Type header (null)
</span><span class="cx"> PASS XMLHttpRequest: setRequestHeader() - Content-Type header (undefined)
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (192619 => 192620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2015-11-19 08:38:17 UTC (rev 192619)
+++ trunk/Source/WebCore/ChangeLog 2015-11-19 09:14:36 UTC (rev 192620)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2015-11-19 Youenn Fablet <youenn.fablet@crf.canon.fr>
+
+ XHR should not combine empty content-type value with default one
+ https://bugs.webkit.org/show_bug.cgi?id=147784
+
+ Reviewed by Darin Adler.
+
+ Previously, XHR was testing whether a "Content-Type" was set using setRequestHeader by checking whether a "Content-Type" header value was empty.
+ This now tests whether "Content-Type" request header is set using either HTTPHeaderMap::contains or checking whether a "Content-Type" header value is null.
+
+ Test: http/tests/xmlhttprequest/post-empty-content-type.html
+
+ * xml/XMLHttpRequest.cpp:
+ (WebCore::XMLHttpRequest::send):
+
</ins><span class="cx"> 2015-11-19 Brady Eidson <beidson@apple.com>
</span><span class="cx">
</span><span class="cx"> Modern IDB: Populate indexes created in object stores that already have records.
</span></span></pre></div>
<a id="trunkSourceWebCorexmlXMLHttpRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/xml/XMLHttpRequest.cpp (192619 => 192620)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-19 08:38:17 UTC (rev 192619)
+++ trunk/Source/WebCore/xml/XMLHttpRequest.cpp 2015-11-19 09:14:36 UTC (rev 192620)
</span><span class="lines">@@ -592,8 +592,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
</span><del>- String contentType = getRequestHeader("Content-Type");
- if (contentType.isEmpty()) {
</del><ins>+ if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) {
</ins><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (usesDashboardBackwardCompatibilityMode())
</span><span class="cx"> setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
</span><span class="lines">@@ -622,7 +621,7 @@
</span><span class="cx">
</span><span class="cx"> if (!body.isNull() && m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
</span><span class="cx"> String contentType = getRequestHeader("Content-Type");
</span><del>- if (contentType.isEmpty()) {
</del><ins>+ if (contentType.isNull()) {
</ins><span class="cx"> #if ENABLE(DASHBOARD_SUPPORT)
</span><span class="cx"> if (usesDashboardBackwardCompatibilityMode())
</span><span class="cx"> setRequestHeaderInternal("Content-Type", "application/x-www-form-urlencoded");
</span><span class="lines">@@ -648,8 +647,7 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> if (m_method != "GET" && m_method != "HEAD" && m_url.protocolIsInHTTPFamily()) {
</span><del>- const String& contentType = getRequestHeader("Content-Type");
- if (contentType.isEmpty()) {
</del><ins>+ if (!m_requestHeaders.contains(HTTPHeaderName::ContentType)) {
</ins><span class="cx"> const String& blobType = body->type();
</span><span class="cx"> if (!blobType.isEmpty() && isValidContentType(blobType))
</span><span class="cx"> setRequestHeaderInternal("Content-Type", blobType);
</span><span class="lines">@@ -676,11 +674,8 @@
</span><span class="cx">
</span><span class="cx"> m_requestEntityBody->generateFiles(document());
</span><span class="cx">
</span><del>- String contentType = getRequestHeader("Content-Type");
- if (contentType.isEmpty()) {
- contentType = makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data());
- setRequestHeaderInternal("Content-Type", contentType);
- }
</del><ins>+ if (!m_requestHeaders.contains(HTTPHeaderName::ContentType))
+ setRequestHeaderInternal("Content-Type", makeString("multipart/form-data; boundary=", m_requestEntityBody->boundary().data()));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> createRequest(ec);
</span></span></pre>
</div>
</div>
</body>
</html>