[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 6abc8949e43f9d020d119cad164889145a3a5e02
Author: kenneth at webkit.org <kenneth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 29 17:44:37 2009 +0000

    The code for showing error pages when the response was
    a 401/403/404, was not actually doing so. This patch
    fixes that.
    
    Patch by Kenneth Rohde Christiansen <kenneth at webkit.org> on 2009-09-29
    Reviewed by Simon Hausmann.
    
    * platform/network/qt/QNetworkReplyHandler.cpp:
    (WebCore::QNetworkReplyHandler::finish):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@48882 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 6b8fe91..a10fc3b 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2009-09-29  Kenneth Rohde Christiansen  <kenneth at webkit.org>
+
+        Reviewed by Simon Hausmann.
+
+        The code for showing error pages when the response was
+        a 401/403/404, was not actually doing so. This patch
+        fixes that.
+
+        * platform/network/qt/QNetworkReplyHandler.cpp:
+        (WebCore::QNetworkReplyHandler::finish):
+
 2009-09-28  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Brady Eidson.
diff --git a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
index 2d59e0a..32ea334 100644
--- a/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
+++ b/WebCore/platform/network/qt/QNetworkReplyHandler.cpp
@@ -228,11 +228,11 @@ void QNetworkReplyHandler::finish()
     } else if (m_reply->error() != QNetworkReply::NoError
                // a web page that returns 401/403/404 can still have content
                && ((m_reply->error() != QNetworkReply::ContentOperationNotPermittedError
-               && m_reply->error() != QNetworkReply::ContentNotFoundError
-               && m_reply->error() != QNetworkReply::ProtocolUnknownError
-               && m_reply->error() != QNetworkReply::UnknownContentError)
-               // If the web page sent content, let's give it to the user.
-               || !m_responseDataSent)
+                 && m_reply->error() != QNetworkReply::ContentAccessDenied  // 401
+                 && m_reply->error() != QNetworkReply::ContentNotFoundError // 404
+                 && m_reply->error() != QNetworkReply::UnknownContentError)
+                 // If the web page sent content, let's give it to the user.
+                 || !m_responseDataSent)
                && m_reply->error() != QNetworkReply::AuthenticationRequiredError
                && m_reply->error() != QNetworkReply::ProxyAuthenticationRequiredError) {
         QUrl url = m_reply->url();

-- 
WebKit Debian packaging