[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[jchaffraix at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit ef3ba1d5326dbabb1f1361e0fc1fc2effbb974c0
Author: jchaffraix at webkit.org <jchaffraix at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Dec 21 09:48:44 2009 +0000

    defersLoading is disabled in current libcURL.
    https://bugs.webkit.org/show_bug.cgi?id=32707
    
    Patch by Julien Chaffraix <jchaffraix at 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.
    
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52438 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f483184..d263ef6 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,22 @@
+2009-12-18  Julien Chaffraix  <jchaffraix at 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 at chromium.org>
 
         Reviewed by Darin Adler.
diff --git a/WebCore/platform/network/curl/ResourceHandleCurl.cpp b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
index 5464e07..81ac1a3 100644
--- a/WebCore/platform/network/curl/ResourceHandleCurl.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleCurl.cpp
@@ -156,7 +156,7 @@ void ResourceHandle::setDefersLoading(bool defers)
     if (d->m_defersLoading == defers)
         return;
 
-#if LIBCURL_VERSION_NUM > 0x071800
+#if LIBCURL_VERSION_NUM > 0x071200
     if (!d->m_handle)
         d->m_defersLoading = defers;
     else if (defers) {
@@ -179,9 +179,7 @@ void ResourceHandle::setDefersLoading(bool defers)
     }
 #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
 }
 
diff --git a/WebCore/platform/network/curl/ResourceHandleManager.cpp b/WebCore/platform/network/curl/ResourceHandleManager.cpp
index a006a14..74edfef 100644
--- a/WebCore/platform/network/curl/ResourceHandleManager.cpp
+++ b/WebCore/platform/network/curl/ResourceHandleManager.cpp
@@ -702,7 +702,7 @@ void ResourceHandleManager::initializeHandle(ResourceHandle* job)
 
     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);
         // If we did not pause the handle, we would ASSERT in the

-- 
WebKit Debian packaging