<!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>[205253] 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/205253">205253</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-08-31 09:44:49 -0700 (Wed, 31 Aug 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>[Fetch API] Request construction failure should not set "bodyUsed"
https://bugs.webkit.org/show_bug.cgi?id=161432
Patch by Youenn Fablet <youenn@apple.com> on 2016-08-31
Reviewed by Alex Christensen.
LayoutTests/imported/w3c:
* web-platform-tests/fetch/api/request/request-disturbed-expected.txt:
* web-platform-tests/fetch/api/request/request-disturbed.html:
Source/WebCore:
Covered by added sub-test coming from chromium fetch test suite.
* Modules/fetch/FetchRequest.cpp:
(WebCore::methodCanHaveBody):
(WebCore::FetchRequest::setBody): Check whether request can have a body before disturbing the passed request.
(WebCore::validateBodyAndMethod): Deleted.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedhtml">trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreModulesfetchFetchRequestcpp">trunk/Source/WebCore/Modules/fetch/FetchRequest.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 (205252 => 205253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-31 16:44:27 UTC (rev 205252)
+++ trunk/LayoutTests/imported/w3c/ChangeLog 2016-08-31 16:44:49 UTC (rev 205253)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2016-08-31 Youenn Fablet <youenn@apple.com>
+
+ [Fetch API] Request construction failure should not set "bodyUsed"
+ https://bugs.webkit.org/show_bug.cgi?id=161432
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/fetch/api/request/request-disturbed-expected.txt:
+ * web-platform-tests/fetch/api/request/request-disturbed.html:
+
</ins><span class="cx"> 2016-08-31 Romain Bellessort <romain.bellessort@crf.canon.fr>
</span><span class="cx">
</span><span class="cx"> [Streams API] Align getReader() with spec
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt (205252 => 205253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt 2016-08-31 16:44:27 UTC (rev 205252)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed-expected.txt 2016-08-31 16:44:49 UTC (rev 205253)
</span><span class="lines">@@ -4,4 +4,5 @@
</span><span class="cx"> PASS Check creating a new request from a disturbed request
</span><span class="cx"> PASS Input request used for creating new request became disturbed
</span><span class="cx"> PASS Check consuming a disturbed request
</span><ins>+PASS Request construction failure should not set "bodyUsed"
</ins><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsfetchapirequestrequestdisturbedhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html (205252 => 205253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html 2016-08-31 16:44:27 UTC (rev 205252)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/fetch/api/request/request-disturbed.html 2016-08-31 16:44:49 UTC (rev 205253)
</span><span class="lines">@@ -50,6 +50,30 @@
</span><span class="cx"> assert_true(bodyConsumed.bodyUsed , "bodyUsed is true when request is disturbed");
</span><span class="cx"> return promise_rejects(test, new TypeError(), bodyConsumed.blob());
</span><span class="cx"> }, "Check consuming a disturbed request");
</span><ins>+
+ test(function() {
+ var req = new Request(URL, {method: 'POST', body: 'hello'});
+ assert_false(req.bodyUsed,
+ 'Request should not be flagged as used if it has not been ' +
+ 'consumed.');
+ assert_throws(
+ {name: 'TypeError'},
+ function() { new Request(req, {method: 'GET'}); },
+ 'A get request may not have body.');
+
+ assert_false(req.bodyUsed, 'After the GET case');
+
+ assert_throws(
+ {name: 'TypeError'},
+ function() { new Request(req, {method: 'CONNECT'}); },
+ 'Request() with a forbidden method must throw.');
+
+ assert_false(req.bodyUsed, 'After the forbidden method case');
+
+ var req2 = new Request(req);
+ assert_true(req.bodyUsed,
+ 'Request should be flagged as used if it has been consumed.');
+ }, 'Request construction failure should not set "bodyUsed"');
</ins><span class="cx"> </script>
</span><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (205252 => 205253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog 2016-08-31 16:44:27 UTC (rev 205252)
+++ trunk/Source/WebCore/ChangeLog 2016-08-31 16:44:49 UTC (rev 205253)
</span><span class="lines">@@ -1,5 +1,19 @@
</span><span class="cx"> 2016-08-31 Youenn Fablet <youenn@apple.com>
</span><span class="cx">
</span><ins>+ [Fetch API] Request construction failure should not set "bodyUsed"
+ https://bugs.webkit.org/show_bug.cgi?id=161432
+
+ Reviewed by Alex Christensen.
+
+ Covered by added sub-test coming from chromium fetch test suite.
+
+ * Modules/fetch/FetchRequest.cpp:
+ (WebCore::methodCanHaveBody):
+ (WebCore::FetchRequest::setBody): Check whether request can have a body before disturbing the passed request.
+ (WebCore::validateBodyAndMethod): Deleted.
+
+2016-08-31 Youenn Fablet <youenn@apple.com>
+
</ins><span class="cx"> [Fetch API] Response bodyUsed should check for its body disturbed state
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=161429
</span><span class="cx">
</span></span></pre></div>
<a id="trunkSourceWebCoreModulesfetchFetchRequestcpp"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp (205252 => 205253)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-08-31 16:44:27 UTC (rev 205252)
+++ trunk/Source/WebCore/Modules/fetch/FetchRequest.cpp 2016-08-31 16:44:49 UTC (rev 205253)
</span><span class="lines">@@ -193,10 +193,8 @@
</span><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static bool validateBodyAndMethod(const FetchBody& body, const FetchRequest::InternalRequest& internalRequest)
</del><ins>+static bool methodCanHaveBody(const FetchRequest::InternalRequest& internalRequest)
</ins><span class="cx"> {
</span><del>- if (body.isEmpty())
- return true;
</del><span class="cx"> return internalRequest.request.httpMethod() != "GET" && internalRequest.request.httpMethod() != "HEAD";
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -257,6 +255,11 @@
</span><span class="cx"> void FetchRequest::setBody(JSC::ExecState& execState, JSC::JSValue body, FetchRequest* request, ExceptionCode& ec)
</span><span class="cx"> {
</span><span class="cx"> if (!body.isNull()) {
</span><ins>+ if (!methodCanHaveBody(m_internalRequest)) {
+ ec = TypeError;
+ return;
+ }
+
</ins><span class="cx"> ASSERT(scriptExecutionContext());
</span><span class="cx"> m_body = FetchBody::extract(*scriptExecutionContext(), execState, body);
</span><span class="cx"> if (m_body.type() == FetchBody::Type::None) {
</span><span class="lines">@@ -265,14 +268,16 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> else if (request && !request->m_body.isEmpty()) {
</span><ins>+ if (!methodCanHaveBody(m_internalRequest)) {
+ ec = TypeError;
+ return;
+ }
+
</ins><span class="cx"> m_body = FetchBody::extractFromBody(&request->m_body);
</span><span class="cx"> request->setDisturbed();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> m_body.updateContentType(m_headers);
</span><del>-
- if (!validateBodyAndMethod(m_body, m_internalRequest))
- ec = TypeError;
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> String FetchRequest::referrer() const
</span></span></pre>
</div>
</div>
</body>
</html>