<!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>[210905] branches/safari-603-branch</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/210905">210905</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-18 19:07:01 -0800 (Wed, 18 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210860">r210860</a>. rdar://problem/30080035</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cChangeLog">branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicrequestuploadexpectedtxt">branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicrequestuploadworkerexpectedtxt">branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-worker-expected.txt</a></li>
<li><a href="#branchessafari603branchSourceWebCoreChangeLog">branches/safari-603-branch/Source/WebCore/ChangeLog</a></li>
<li><a href="#branchessafari603branchSourceWebCoreModulesfetchFetchBodycpp">branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.cpp</a></li>
<li><a href="#branchessafari603branchSourceWebCoreModulesfetchFetchBodyh">branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreModulesfetchFetchRequesth">branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchRequest.h</a></li>
<li><a href="#branchessafari603branchSourceWebCoreModulesfetchFetchResponsecpp">branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchResponse.cpp</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210860. rdar://problem/30080035
+
+ 2017-01-18 Youenn Fablet <youenn@apple.com>
+
+ Reject fetch promise in case of ReadableStream upload
+ https://bugs.webkit.org/show_bug.cgi?id=167145
+
+ Reviewed by Alex Christensen.
+
+ * TestExpectations:
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210831. rdar://problem/29057611
</span><span class="cx">
</span><span class="cx"> 2017-01-17 Zalan Bujtas <zalan@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/ChangeLog 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -1,3 +1,17 @@
</span><ins>+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
+ Merge r210860. rdar://problem/30080035
+
+ 2017-01-18 Youenn Fablet <youenn@apple.com>
+
+ Reject fetch promise in case of ReadableStream upload
+ https://bugs.webkit.org/show_bug.cgi?id=167145
+
+ Reviewed by Alex Christensen.
+
+ * web-platform-tests/fetch/api/basic/request-upload-expected.txt:
+ * web-platform-tests/fetch/api/basic/request-upload-worker-expected.txt:
+
</ins><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><span class="cx"> Merge r210616. rdar://problem/29971105
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicrequestuploadexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-expected.txt (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-expected.txt 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-expected.txt 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -10,4 +10,5 @@
</span><span class="cx"> PASS Fetch with POST with Float64Array body
</span><span class="cx"> PASS Fetch with POST with DataView body
</span><span class="cx"> PASS Fetch with POST with Blob body with mime type
</span><ins>+FAIL Fetch with POST with ReadableStream promise_test: Unhandled rejection with value: object "TypeError: ReadableStream uploading is not supported"
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsimportedw3cwebplatformtestsfetchapibasicrequestuploadworkerexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-worker-expected.txt (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-worker-expected.txt 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/LayoutTests/imported/w3c/web-platform-tests/fetch/api/basic/request-upload-worker-expected.txt 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -10,4 +10,4 @@
</span><span class="cx"> PASS Fetch with POST with Float64Array body
</span><span class="cx"> PASS Fetch with POST with DataView body
</span><span class="cx"> PASS Fetch with POST with Blob body with mime type
</span><del>-
</del><ins>+FAIL Fetch with POST with ReadableStream promise_test: Unhandled rejection with value: object "TypeError: ReadableStream uploading is not supported"
</ins></span></pre></div>
<a id="branchessafari603branchSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/ChangeLog (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/Source/WebCore/ChangeLog 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210860. rdar://problem/30080035
+
+ 2017-01-18 Youenn Fablet <youenn@apple.com>
+
+ Reject fetch promise in case of ReadableStream upload
+ https://bugs.webkit.org/show_bug.cgi?id=167145
+
+ Reviewed by Alex Christensen.
+
+ Covered by rebased tests.
+
+ * Modules/fetch/FetchBody.cpp:
+ (WebCore::FetchBody::extract): Storing the fact that body data is represented as a ReadableStream.
+ * Modules/fetch/FetchBody.h:
+ (WebCore::FetchBody::isReadableStream):
+ * Modules/fetch/FetchRequest.h:
+ * Modules/fetch/FetchResponse.cpp:
+ (WebCore::FetchResponse::fetch): Rejecting if request body data is a ReadableStream.
+
+2017-01-18 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210774. rdar://problem/30019773
</span><span class="cx">
</span><span class="cx"> 2017-01-14 Chris Dumez <cdumez@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreModulesfetchFetchBodycpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.cpp (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.cpp 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.cpp 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -68,8 +68,11 @@
</span><span class="cx"> contentType = HTTPHeaderValues::formURLEncodedContentType();
</span><span class="cx"> return FetchBody(*JSURLSearchParams::toWrapped(value));
</span><span class="cx"> }
</span><del>- if (value.inherits(JSReadableStream::info()))
- return FetchBody();
</del><ins>+ if (value.inherits(JSReadableStream::info())) {
+ FetchBody body;
+ body.m_isReadableStream = true;
+ return WTFMove(body);
+ }
</ins><span class="cx"> if (value.inherits(JSC::JSArrayBuffer::info())) {
</span><span class="cx"> ArrayBuffer* data = toUnsharedArrayBuffer(value);
</span><span class="cx"> ASSERT(data);
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreModulesfetchFetchBodyh"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.h (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.h 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchBody.h 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -68,6 +68,7 @@
</span><span class="cx"> bool isArrayBufferView() const { return WTF::holds_alternative<Ref<const ArrayBufferView>>(m_data); }
</span><span class="cx"> bool isURLSearchParams() const { return WTF::holds_alternative<Ref<const URLSearchParams>>(m_data); }
</span><span class="cx"> bool isText() const { return WTF::holds_alternative<String>(m_data); }
</span><ins>+ bool isReadableStream() const { return m_isReadableStream; }
</ins><span class="cx">
</span><span class="cx"> static std::optional<FetchBody> extract(ScriptExecutionContext&, JSC::ExecState&, JSC::JSValue, String&);
</span><span class="cx"> static FetchBody loadingBody() { return { }; }
</span><span class="lines">@@ -114,6 +115,9 @@
</span><span class="cx">
</span><span class="cx"> FetchBodyConsumer m_consumer { FetchBodyConsumer::Type::None };
</span><span class="cx"> RefPtr<DeferredPromise> m_consumePromise;
</span><ins>+
+ // FIXME: We probably want to keep the stream as a specific field in m_data when we will support stream data upload.
+ bool m_isReadableStream { false };
</ins><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> } // namespace WebCore
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreModulesfetchFetchRequesth"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchRequest.h (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchRequest.h 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchRequest.h 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -96,6 +96,7 @@
</span><span class="cx">
</span><span class="cx"> const FetchOptions& fetchOptions() const { return m_internalRequest.options; }
</span><span class="cx"> ResourceRequest internalRequest() const;
</span><ins>+ bool isBodyReadableStream() const { return !isBodyNull() && body().isReadableStream(); }
</ins><span class="cx">
</span><span class="cx"> const String& internalRequestReferrer() const { return m_internalRequest.referrer; }
</span><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchSourceWebCoreModulesfetchFetchResponsecpp"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchResponse.cpp (210904 => 210905)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchResponse.cpp 2017-01-19 03:06:56 UTC (rev 210904)
+++ branches/safari-603-branch/Source/WebCore/Modules/fetch/FetchResponse.cpp 2017-01-19 03:07:01 UTC (rev 210905)
</span><span class="lines">@@ -100,6 +100,10 @@
</span><span class="cx">
</span><span class="cx"> void FetchResponse::fetch(ScriptExecutionContext& context, FetchRequest& request, FetchPromise&& promise)
</span><span class="cx"> {
</span><ins>+ if (request.isBodyReadableStream()) {
+ promise.reject(TypeError, "ReadableStream uploading is not supported");
+ return;
+ }
</ins><span class="cx"> auto response = adoptRef(*new FetchResponse(context, FetchBody::loadingBody(), FetchHeaders::create(FetchHeaders::Guard::Immutable), { }));
</span><span class="cx">
</span><span class="cx"> // Setting pending activity until BodyLoader didFail or didSucceed callback is called.
</span></span></pre>
</div>
</div>
</body>
</html>