<!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>[244813] 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/244813">244813</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-04-30 16:56:20 -0700 (Tue, 30 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>[macOS WK1] ASSERTION FAILED: formData in WebCore::ResourceRequest::doUpdateResourceHTTPBody()
https://bugs.webkit.org/show_bug.cgi?id=196864
<rdar://problem/49854497>

Reviewed by Alex Christensen.

LayoutTests/imported/w3c:

* web-platform-tests/xhr/send-redirect-post-upload-expected.txt:

Source/WebCore:

In case of redirection, it is sometimes not possible to retrieve the form data
from its NSInputStream in case of redirections.
To handle this case, reuse the first request form data if the new request has a body.
We also clear the HTTP content type in such a case if the original request has no content type.

Covered by re-enabled tests.

* platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
(-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):

LayoutTests:

* platform/mac-wk1/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cChangeLog">trunk/LayoutTests/imported/w3c/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsimportedw3cwebplatformtestsxhrsendredirectpostuploadexpectedtxt">trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk1TestExpectations">trunk/LayoutTests/platform/mac-wk1/TestExpectations</a></li>
<li><a href="#trunkSourceWebCoreChangeLog">trunk/Source/WebCore/ChangeLog</a></li>
<li><a href="#trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm">trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/LayoutTests/ChangeLog 2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2019-04-30  Youenn Fablet  <youenn@apple.com>
+
+        [macOS WK1] ASSERTION FAILED: formData in WebCore::ResourceRequest::doUpdateResourceHTTPBody()
+        https://bugs.webkit.org/show_bug.cgi?id=196864
+        <rdar://problem/49854497>
+
+        Reviewed by Alex Christensen.
+
+        * platform/mac-wk1/TestExpectations:
+
</ins><span class="cx"> 2019-04-30  Shawn Roberts  <sroberts@apple.com>
</span><span class="cx"> 
</span><span class="cx">         imported/w3c/web-platform-tests/xhr/event-upload-progress-crossorigin.htm is a flaky failure
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/ChangeLog (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/ChangeLog 2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/LayoutTests/imported/w3c/ChangeLog    2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -1,5 +1,15 @@
</span><span class="cx"> 2019-04-30  Youenn Fablet  <youenn@apple.com>
</span><span class="cx"> 
</span><ins>+        [macOS WK1] ASSERTION FAILED: formData in WebCore::ResourceRequest::doUpdateResourceHTTPBody()
+        https://bugs.webkit.org/show_bug.cgi?id=196864
+        <rdar://problem/49854497>
+
+        Reviewed by Alex Christensen.
+
+        * web-platform-tests/xhr/send-redirect-post-upload-expected.txt:
+
+2019-04-30  Youenn Fablet  <youenn@apple.com>
+
</ins><span class="cx">         Update WPT service-worker resource-timing test to use hosts[alt]
</span><span class="cx">         https://bugs.webkit.org/show_bug.cgi?id=197329
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsimportedw3cwebplatformtestsxhrsendredirectpostuploadexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt     2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt        2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -2,5 +2,6 @@
</span><span class="cx"> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (301) 
</span><span class="cx"> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (302) 
</span><span class="cx"> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (303) 
</span><del>-FAIL XMLHttpRequest: The send() method: POSTing to URL that redirects (307) assert_array_equals: events firing in expected order and states lengths differ, expected 9 got 10
</del><ins>+PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (307 (string)) 
+PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (307 (blob)) 
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk1TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk1/TestExpectations (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk1/TestExpectations      2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/LayoutTests/platform/mac-wk1/TestExpectations 2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -432,7 +432,6 @@
</span><span class="cx"> [ Sierra+ ] svg/hixie/text/003.html [ Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/159893 [ Debug ] imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm [ Pass Failure ]
</span><del>-webkit.org/b/196864 [ Debug ] imported/w3c/web-platform-tests/xhr/event-upload-progress.htm [ Skip ]
</del><span class="cx"> 
</span><span class="cx"> webkit.org/b/160101 userscripts/window-onerror-for-isolated-world-3.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="lines">@@ -698,8 +697,6 @@
</span><span class="cx"> webkit.org/b/195098 pointerevents/mouse/pointer-capture.html [ Failure ]
</span><span class="cx"> webkit.org/b/195098 pointerevents/mouse/pointer-events-before-mouse-events.html [ Failure ]
</span><span class="cx"> 
</span><del>-webkit.org/b/159724 [ Debug ] imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm [ Skip ]
-
</del><span class="cx"> webkit.org/b/196448 [ Debug ] inspector/audit/basic.html [ Pass Timeout ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/196502 media/video-background-tab-playback.html [ Pass Failure ]
</span></span></pre></div>
<a id="trunkSourceWebCoreChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/ChangeLog (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/ChangeLog   2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/Source/WebCore/ChangeLog      2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-04-30  Youenn Fablet  <youenn@apple.com>
+
+        [macOS WK1] ASSERTION FAILED: formData in WebCore::ResourceRequest::doUpdateResourceHTTPBody()
+        https://bugs.webkit.org/show_bug.cgi?id=196864
+        <rdar://problem/49854497>
+
+        Reviewed by Alex Christensen.
+
+        In case of redirection, it is sometimes not possible to retrieve the form data
+        from its NSInputStream in case of redirections.
+        To handle this case, reuse the first request form data if the new request has a body.
+        We also clear the HTTP content type in such a case if the original request has no content type.
+
+        Covered by re-enabled tests.
+
+        * platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm:
+        (-[WebCoreResourceHandleAsOperationQueueDelegate connection:willSendRequest:redirectResponse:]):
+
</ins><span class="cx"> 2019-04-30  Commit Queue  <commit-queue@webkit.org>
</span><span class="cx"> 
</span><span class="cx">         Unreviewed, rolling out r244773.
</span></span></pre></div>
<a id="trunkSourceWebCoreplatformnetworkmacWebCoreResourceHandleAsOperationQueueDelegatemm"></a>
<div class="modfile"><h4>Modified: trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm (244812 => 244813)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm       2019-04-30 23:56:05 UTC (rev 244812)
+++ trunk/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm  2019-04-30 23:56:20 UTC (rev 244813)
</span><span class="lines">@@ -139,7 +139,14 @@
</span><span class="cx">             return;
</span><span class="cx">         }
</span><span class="cx"> 
</span><del>-        m_handle->willSendRequest(newRequest.get(), redirectResponse.get(), [self, protectedSelf = WTFMove(protectedSelf)](ResourceRequest&& request) {
</del><ins>+        ResourceRequest redirectRequest = newRequest.get();
+        if ([newRequest.get() HTTPBodyStream]) {
+            ASSERT(m_handle->firstRequest().httpBody());
+            redirectRequest.setHTTPBody(m_handle->firstRequest().httpBody());
+        }
+        if (m_handle->firstRequest().httpContentType().isEmpty())
+            redirectRequest.clearHTTPContentType();
+        m_handle->willSendRequest(WTFMove(redirectRequest), redirectResponse.get(), [self, protectedSelf = WTFMove(protectedSelf)](ResourceRequest&& request) {
</ins><span class="cx">             m_requestResult = request.nsURLRequest(HTTPBodyUpdatePolicy::UpdateHTTPBody);
</span><span class="cx">             m_semaphore.signal();
</span><span class="cx">         });
</span></span></pre>
</div>
</div>

</body>
</html>