Attachment 362434 Details for Bug 194523 – Patch

[patch] Patch

bug-194523-20190219144707.patch (text/plain), 3.50 KB, created by Alex Christensen on 2019-02-19 14:47:08 PST

(hide)

Description:

Filename:

MIME Type:

Creator: Alex Christensen

Created: 2019-02-19 14:47:08 PST

Size: 3.50 KB

patch

obsolete

>Index: Source/WebKit/ChangeLog
>===================================================================
>--- Source/WebKit/ChangeLog	(revision 241776)
>+++ Source/WebKit/ChangeLog	(working copy)
>@@ -1,3 +1,19 @@
>+2019-02-19  Alex Christensen  <achristensen@webkit.org>
>+
>+        REGRESSION: ( r240978-r240985 ) [ iOS Release ] Layout Test imported/w3c/web-platform-tests/xhr/send-redirect-post-upload.htm is crashing
>+        https://bugs.webkit.org/show_bug.cgi?id=194523
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        Attempt to work around a CFNetwork bug in the timing of tearing down tasks with upload streams.
>+        See rdar://problem/28233746.
>+
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.h:
>+        * NetworkProcess/cocoa/NetworkDataTaskCocoa.mm:
>+        (WebKit::NetworkDataTaskCocoa::~NetworkDataTaskCocoa):
>+        * NetworkProcess/cocoa/NetworkSessionCocoa.mm:
>+        (-[WKNetworkSessionDelegate URLSession:task:needNewBodyStream:]):
>+
> 2019-02-19  Antoine Quint  <graouts@apple.com>
> 
>         [iOS] "touch-action: none" should not prevent text selection or tapping on a link
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	(revision 241753)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.h	(working copy)
>@@ -83,6 +83,8 @@ public:
> 
>     String description() const override;
> 
>+    void setShouldExtendTaskLifetime(bool shouldExtendTaskLifetime) { m_shouldExtendTaskLifetime = shouldExtendTaskLifetime; }
>+
> private:
>     NetworkDataTaskCocoa(NetworkSession&, NetworkDataTaskClient&, const WebCore::ResourceRequest&, uint64_t frameID, uint64_t pageID, WebCore::StoredCredentialsPolicy, WebCore::ContentSniffingPolicy, WebCore::ContentEncodingSniffingPolicy, bool shouldClearReferrerOnHTTPSToHTTPRedirect, PreconnectOnly, bool dataTaskIsForMainFrameNavigation, Optional<NetworkActivityTracker>);
> 
>@@ -104,6 +106,9 @@ private:
>     uint64_t m_frameID;
>     uint64_t m_pageID;
> 
>+    // FIXME: This is only needed until rdar://problem/28233746 is fixed.
>+    bool m_shouldExtendTaskLifetime { false };
>+
> #if ENABLE(RESOURCE_LOAD_STATISTICS)
>     bool m_hasBeenSetToUseStatelessCookieStorage { false };
> #endif
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(revision 241753)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkDataTaskCocoa.mm	(working copy)
>@@ -261,6 +261,9 @@ NetworkDataTaskCocoa::~NetworkDataTaskCo
>         ASSERT(cocoaSession.m_dataTaskMapWithoutState.get([m_task taskIdentifier]) == this);
>         cocoaSession.m_dataTaskMapWithoutState.remove([m_task taskIdentifier]);
>     }
>+    
>+    if (m_shouldExtendTaskLifetime)
>+        RunLoop::main().dispatch([task = WTFMove(m_task)] { });
> }
> 
> void NetworkDataTaskCocoa::restrictRequestReferrerToOriginIfNeeded(WebCore::ResourceRequest& request, bool shouldBlockCookies)
>Index: Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm
>===================================================================
>--- Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	(revision 241753)
>+++ Source/WebKit/NetworkProcess/cocoa/NetworkSessionCocoa.mm	(working copy)
>@@ -383,6 +383,7 @@ - (void)URLSession:(NSURLSession *)sessi
>         return;
>     }
> 
>+    networkDataTask->setShouldExtendTaskLifetime(true);
>     completionHandler(WebCore::createHTTPBodyNSInputStream(*body).get());
> }
>

Actions: View | Formatted Diff | Diff

Attachments on bug 194523: 362085 | 362434 | 364041