Attachment 368580 Details for Bug 196864 – Patch

[patch] Patch

bug-196864-20190430110641.patch (text/plain), 6.33 KB, created by youenn fablet on 2019-04-30 11:06:42 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-04-30 11:06:42 PDT

Size: 6.33 KB

patch

obsolete

>Subversion Revision: 244694
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 83a5570adea3d55df64ea767b4b5aa71bb39ed4e..132dbb9055e42982c77f8231a2e61317b6e4c141 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,21 @@
>+2019-04-29  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 NOBODY (OOPS!).
>+
>+        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:]):
>+
> 2019-04-29  Youenn Fablet  <youenn@apple.com>
> 
>         Make Document audio producers use WeakPtr
>diff --git a/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm b/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
>index a4c47170cb43524c79b0c539f6c1a79ef36c52e9..7cf6346bb6dc6bab4750beb37f79123029c611d8 100644
>--- a/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
>+++ b/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
>@@ -139,7 +139,14 @@ - (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSUR
>             return;
>         }
> 
>-        m_handle->willSendRequest(newRequest.get(), redirectResponse.get(), [self, protectedSelf = WTFMove(protectedSelf)](ResourceRequest&& request) {
>+        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) {
>             m_requestResult = request.nsURLRequest(HTTPBodyUpdatePolicy::UpdateHTTPBody);
>             m_semaphore.signal();
>         });
>diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
>index 3264a8078bbd295b40f1de40250ae78849a9b1c6..c7741b8a2e4f68c6d7a50383f537c07bdef167ba 100644
>--- a/LayoutTests/ChangeLog
>+++ b/LayoutTests/ChangeLog
>@@ -1,3 +1,13 @@
>+2019-04-29  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 NOBODY (OOPS!).
>+
>+        * platform/mac-wk1/TestExpectations:
>+
> 2019-04-28  Youenn Fablet  <youenn@apple.com>
> 
>         getDisplayMedia should be called on user gesture
>diff --git a/LayoutTests/imported/w3c/ChangeLog b/LayoutTests/imported/w3c/ChangeLog
>index 076f6d2a859863a2bd1b1bd08decdd0573f91dee..211e0776f54891a872197ac05834dc90eb3f5741 100644
>--- a/LayoutTests/imported/w3c/ChangeLog
>+++ b/LayoutTests/imported/w3c/ChangeLog
>@@ -1,3 +1,13 @@
>+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 NOBODY (OOPS!).
>+
>+        * web-platform-tests/xhr/send-redirect-post-upload-expected.txt:
>+
> 2019-04-26  Youenn Fablet  <youenn@apple.com>
> 
>         Kept alive loaders should use the redirected request in case of redirections
>diff --git a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt
>index 2dd47d13f49f1480a8eee87b7769b3cfec478415..7ca9c93182ea788982479d75df138cd30d7690e5 100644
>--- a/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt
>+++ b/LayoutTests/imported/w3c/web-platform-tests/xhr/send-redirect-post-upload-expected.txt
>@@ -2,5 +2,6 @@
> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (301) 
> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (302) 
> PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (303) 
>-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
>+PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (307 (string)) 
>+PASS XMLHttpRequest: The send() method: POSTing to URL that redirects (307 (blob)) 
> 
>diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index 18511a196346a7dfea0a1970f84f6da500c4c5a5..956eede914e04b75ca2ae5a775ff3a415278650f 100644
>--- a/LayoutTests/platform/mac-wk1/TestExpectations
>+++ b/LayoutTests/platform/mac-wk1/TestExpectations
>@@ -432,7 +432,6 @@ webkit.org/b/158585 webgl/webgl-backing-store-size-update.html [ Pass Timeout ]
> [ Sierra+ ] svg/hixie/text/003.html [ Failure ]
> 
> webkit.org/b/159893 [ Debug ] imported/w3c/web-platform-tests/xhr/event-readystatechange-loaded.htm [ Pass Failure ]
>-webkit.org/b/196864 [ Debug ] imported/w3c/web-platform-tests/xhr/event-upload-progress.htm [ Skip ]
> 
> webkit.org/b/160101 userscripts/window-onerror-for-isolated-world-3.html [ Pass Failure ]
> 
>@@ -698,8 +697,6 @@ webkit.org/b/195098 pointerevents/mouse/over-enter-out-leave.html [ Failure ]
> webkit.org/b/195098 pointerevents/mouse/pointer-capture.html [ Failure ]
> webkit.org/b/195098 pointerevents/mouse/pointer-events-before-mouse-events.html [ Failure ]
> 
>-webkit.org/b/159724 [ Debug ] imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm [ Skip ]
>-
> webkit.org/b/196448 [ Debug ] inspector/audit/basic.html [ Pass Timeout ]
> 
> webkit.org/b/196502 media/video-background-tab-playback.html [ Pass Failure ]

Actions: View | Formatted Diff | Diff

Attachments on bug 196864: 367327 | 368532 | 368580 | 368602