Attachment 368532 Details for Bug 196864 – Patch

[patch] Patch

bug-196864-20190429195702.patch (text/plain), 3.78 KB, created by youenn fablet on 2019-04-29 19:57:02 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: youenn fablet

Created: 2019-04-29 19:57:02 PDT

Size: 3.78 KB

patch

obsolete

>Subversion Revision: 244694
>diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
>index 83a5570adea3d55df64ea767b4b5aa71bb39ed4e..9484e833e356155cdf39fa662c53d13ef6ae9eeb 100644
>--- a/Source/WebCore/ChangeLog
>+++ b/Source/WebCore/ChangeLog
>@@ -1,3 +1,19 @@
>+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.
>+        Covered by enabled test.
>+
>+        * 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..8023a5bb4b886b82f13d663b205375270ca8be4d 100644
>--- a/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
>+++ b/Source/WebCore/platform/network/mac/WebCoreResourceHandleAsOperationQueueDelegate.mm
>@@ -139,7 +139,12 @@ - (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());
>+        }
>+        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/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
>index 18511a196346a7dfea0a1970f84f6da500c4c5a5..9a576661e195fd56b2e7bbd1c7c1fe33bb455619 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 ]
>

Actions: View | Formatted Diff | Diff

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