2008-01-10 Luca Bruno <lethalman88@gmail.com>

        Reviewed by Alp Toker.

        Back out r29206 which was causing regressions in curl http job
        cancellation.

        * platform/network/curl/ResourceHandleManager.cpp
        (ResourceHandleManager::cancel):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@29366 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index ad3ff9dee4b751a784d81a34885787cd4100c2fe..6124201697f2f909193f0223d3f923c65a3380f0 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,13 @@
+2008-01-10  Luca Bruno  <lethalman88@gmail.com>
+
+        Reviewed by Alp Toker.
+
+        Back out r29206 which was causing regressions in curl http job
+        cancellation.
+
+        * platform/network/curl/ResourceHandleManager.cpp
+        (ResourceHandleManager::cancel): 
+
 2008-01-10  Kevin McCullough  <kmccullough@apple.com>
 
         Reviewed by Darin, Sam, and Adam.

diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index 456c6dbc3f4bda3b52f973df51d4cce0fbe6f388..39525e0166112093a8228e3de192dd9a78661c54 100644 (file)
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -515,11 +515,10 @@ void ResourceHandleManager::cancel(ResourceHandle* job)
     if (removeScheduledJob(job))
         return;
 
-    if (m_downloadTimer.isActive()) {
-        ResourceHandleInternal* d = job->getInternal();
-        d->m_cancelled = true;
-    } else
-        removeFromCurl(job);
+    ResourceHandleInternal* d = job->getInternal();
+    d->m_cancelled = true;
+    if (!m_downloadTimer.isActive())
+        m_downloadTimer.startOneShot(pollTimeSeconds);
 }
 
 } // namespace WebCore