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
+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.
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