[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.15.1-1414-gc69ee75

[kenneth at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit c7161bce887199dc841fd9f9634105c913b1eb62
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 22:06:59 2009 +0000

    Rubberstamped by David Hyatt.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-09-29
    Fix to logic of earlier commit 48902.
    
    When merging two if's before committing, I forgot to invert the
    bool check.
    
    * platform/network/qt/QNetworkReplyHandler.cpp:
    (WebCore::ignoreHttpError):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48906 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index f5e08e5..d2f22ac 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-09-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Rubberstamped by David Hyatt.
+
+        Fix to logic of earlier commit 48902.
+
+        When merging two if's before committing, I forgot to invert the
+        bool check.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::ignoreHttpError):
+
 2009-09-29  Stephen White  <senorblanco at chromium.org>
 
         Unreviewed, build fix.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 7537592..3303b34 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -212,7 +212,7 @@ static bool ignoreHttpError(QNetworkReply* reply, bool receivedData)
     if (httpStatusCode == 401 || httpStatusCode == 407)
         return true;
 
-    if (!receivedData && (httpStatusCode >= 400 && httpStatusCode < 600))
+    if (receivedData && (httpStatusCode >= 400 && httpStatusCode < 600))
         return true;
 
     return false;

-- 
WebKit Debian packaging