Attachment 372442 Details for Bug 198993 – Patch

[patch] Patch

bug-198993-20190619165415.patch (text/plain), 1.53 KB, created by Takashi Komori on 2019-06-19 00:56:31 PDT

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Komori

Created: 2019-06-19 00:56:31 PDT

Size: 1.53 KB

patch

obsolete

>Subversion Revision: 246558
>diff --git a/Source/WebKit/ChangeLog b/Source/WebKit/ChangeLog
>index 85bd4af3e298ca810f5a0e6bb492b16c2025c1ef..a22a05736e7e27aac8796752bfb437b1b10f4fae 100644
>--- a/Source/WebKit/ChangeLog
>+++ b/Source/WebKit/ChangeLog
>@@ -1,3 +1,15 @@
>+2019-06-19  Takashi Komori  <Takashi.Komori@sony.com>
>+
>+        [Curl] CurlRequestScheduler doesn't terminate worker thread in a certain situation.
>+        https://bugs.webkit.org/show_bug.cgi?id=198993
>+
>+        Cancel CurlRequest before invalidation to remove tasks from CurlRequestScheduler certainly in ~NetworkDataTaskCurl.
>+
>+        Reviewed by NOBODY (OOPS!).
>+
>+        * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
>+        (WebKit::NetworkDataTaskCurl::~NetworkDataTaskCurl):
>+
> 2019-06-18  Youenn Fablet  <youenn@apple.com>
> 
>         StorageManager::removeAllowedSessionStorageNamespaceConnection should make sure its storageNamespaceID is valid
>diff --git a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>index 30f794f7584a56a1684488d6ad49ed4507ddd4d5..ad5d9fa74094c66d9c24c3280d4325b77bbc46ef 100644
>--- a/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>+++ b/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp
>@@ -76,8 +76,7 @@ NetworkDataTaskCurl::NetworkDataTaskCurl(NetworkSession& session, NetworkDataTas
> 
> NetworkDataTaskCurl::~NetworkDataTaskCurl()
> {
>-    if (m_curlRequest)
>-        m_curlRequest->invalidateClient();
>+    invalidateAndCancel();
> }
> 
> void NetworkDataTaskCurl::resume()

Actions: View | Formatted Diff | Diff

Attachments on bug 198993: 372442