Title: [246588] trunk/Source/WebKit
- Revision
- 246588
- Author
- [email protected]
- Date
- 2019-06-19 08:11:30 -0700 (Wed, 19 Jun 2019)
Log Message
[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.
Patch by Takashi Komori <[email protected]> on 2019-06-19
Reviewed by Fujii Hironori.
* NetworkProcess/curl/NetworkDataTaskCurl.cpp:
(WebKit::NetworkDataTaskCurl::~NetworkDataTaskCurl):
Modified Paths
Diff
Modified: trunk/Source/WebKit/ChangeLog (246587 => 246588)
--- trunk/Source/WebKit/ChangeLog 2019-06-19 15:07:31 UTC (rev 246587)
+++ trunk/Source/WebKit/ChangeLog 2019-06-19 15:11:30 UTC (rev 246588)
@@ -1,3 +1,15 @@
+2019-06-19 Takashi Komori <[email protected]>
+
+ [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 Fujii Hironori.
+
+ * NetworkProcess/curl/NetworkDataTaskCurl.cpp:
+ (WebKit::NetworkDataTaskCurl::~NetworkDataTaskCurl):
+
2019-06-19 Zan Dobersek <[email protected]>
[Nicosia] Invalidate SceneIntegration in LayerTreeHost::invalidate()
Modified: trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp (246587 => 246588)
--- trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-06-19 15:07:31 UTC (rev 246587)
+++ trunk/Source/WebKit/NetworkProcess/curl/NetworkDataTaskCurl.cpp 2019-06-19 15:11:30 UTC (rev 246588)
@@ -76,8 +76,7 @@
NetworkDataTaskCurl::~NetworkDataTaskCurl()
{
- if (m_curlRequest)
- m_curlRequest->invalidateClient();
+ invalidateAndCancel();
}
void NetworkDataTaskCurl::resume()
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
