Changeset 52438 in webkit

Timestamp:

Dec 21, 2009 1:48:44 AM (14 years ago)

Author:

jchaffraix@webkit.org

Message:

defersLoading is disabled in current libcURL.
​https://bugs.webkit.org/show_bug.cgi?id=32707

Patch by Julien Chaffraix <​jchaffraix@pleyo.com> on 2009-12-18
Reviewed by Darin Adler.

Basically this change reverts r49577 that was totally wrong.
According to curlver.h, LIBCURL_VERSION_NUM is a
"6-digit (24 bits) hexadecimal number".

The check should be against 0x071200 (7.18) as it was originally the case.

• platform/network/curl/ResourceHandleManager.cpp:

(WebCore::ResourceHandleManager::initializeHandle): Use the right check.

• platform/network/curl/ResourceHandleCurl.cpp:

(WebCore::ResourceHandle::setDefersLoading): Ditto. Also removed a print
to use a LOG_ERROR instead.

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/network/curl/ResourceHandleCurl.cpp (modified) (2 diffs)
• platform/network/curl/ResourceHandleManager.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2009-12-18  Julien Chaffraix  <jchaffraix@pleyo.com>
+
+        Reviewed by Darin Adler.
+
+        defersLoading is disabled in current libcURL.
+        https://bugs.webkit.org/show_bug.cgi?id=32707
+
+        Basically this change reverts r49577 that was totally wrong.
+        According to curlver.h, LIBCURL_VERSION_NUM is a
+        "6-digit (24 bits) hexadecimal number".
+
+        The check should be against 0x071200 (7.18) as it was originally the case.
+
+       * platform/network/curl/ResourceHandleManager.cpp:
+        (WebCore::ResourceHandleManager::initializeHandle): Use the right check.
+        * platform/network/curl/ResourceHandleCurl.cpp:
+        (WebCore::ResourceHandle::setDefersLoading): Ditto. Also removed a print
+        to use a LOG_ERROR instead.
+ 
 2009-12-20  Kent Tamura  <tkent@chromium.org>
 

trunk/WebCore/platform/network/curl/ResourceHandleCurl.cpp

@@ -157 +157 @@
         return;
 
-#if LIBCURL_VERSION_NUM > 0x071800
+#if LIBCURL_VERSION_NUM > 0x071200
     if (!d->m_handle)
         d->m_defersLoading = defers;
@@ -180 +180 @@
 #else
     d->m_defersLoading = defers;
-#ifndef NDEBUG
-    printf("Deferred loading is implemented if libcURL version is above 7.18.0");
-#endif
+    LOG_ERROR("Deferred loading is implemented if libcURL version is above 7.18.0");
 #endif
 }

trunk/WebCore/platform/network/curl/ResourceHandleManager.cpp

@@ -703 +703 @@
     d->m_handle = curl_easy_init();
 
-#if LIBCURL_VERSION_NUM > 0x071800
+#if LIBCURL_VERSION_NUM > 0x071200
     if (d->m_defersLoading) {
         CURLcode error = curl_easy_pause(d->m_handle, CURLPAUSE_ALL);