Title: [131301] trunk/Source/WebCore
- Revision
- 131301
- Author
- [email protected]
- Date
- 2012-10-15 07:47:12 -0700 (Mon, 15 Oct 2012)
Log Message
REGRESSION(130613): Reintroduces crashes when using soup's timeout functionality
https://bugs.webkit.org/show_bug.cgi?id=99311
Reviewed by Gustavo Noronha Silva.
Removing the cleanupSoupRequestOperation call, since the cancel() call will eventually trigger the
cleanup already setting the right flag. Cleaning the handle already here will result in crashes when
using the soup timeout functionality.
The explicit cleanup call reintroduced in r130613, after it had been previously removed in r130348.
No new tests, tests that catch this will be part of bug 74802 for XHR timeout support.
* platform/network/soup/ResourceHandleSoup.cpp:
(WebCore::requestTimeoutCallback):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (131300 => 131301)
--- trunk/Source/WebCore/ChangeLog 2012-10-15 14:06:06 UTC (rev 131300)
+++ trunk/Source/WebCore/ChangeLog 2012-10-15 14:47:12 UTC (rev 131301)
@@ -1,3 +1,20 @@
+2012-10-15 Dominik Röttsches <[email protected]>
+
+ REGRESSION(130613): Reintroduces crashes when using soup's timeout functionality
+ https://bugs.webkit.org/show_bug.cgi?id=99311
+
+ Reviewed by Gustavo Noronha Silva.
+
+ Removing the cleanupSoupRequestOperation call, since the cancel() call will eventually trigger the
+ cleanup already setting the right flag. Cleaning the handle already here will result in crashes when
+ using the soup timeout functionality.
+ The explicit cleanup call reintroduced in r130613, after it had been previously removed in r130348.
+
+ No new tests, tests that catch this will be part of bug 74802 for XHR timeout support.
+
+ * platform/network/soup/ResourceHandleSoup.cpp:
+ (WebCore::requestTimeoutCallback):
+
2012-10-15 Ilya Tikhonovsky <[email protected]>
Web Inspector: convert manual size calculation of different WebKit things into MemoryInstrumentation.
Modified: trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp (131300 => 131301)
--- trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-10-15 14:06:06 UTC (rev 131300)
+++ trunk/Source/WebCore/platform/network/soup/ResourceHandleSoup.cpp 2012-10-15 14:47:12 UTC (rev 131301)
@@ -1002,7 +1002,6 @@
{
RefPtr<ResourceHandle> handle = static_cast<ResourceHandle*>(data);
handle->client()->didFail(handle.get(), ResourceError::timeoutError(handle->getInternal()->m_firstRequest.url().string()));
- cleanupSoupRequestOperation(handle.get());
handle->cancel();
return FALSE;
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo/webkit-changes
