[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf

[eric at webkit.org]

The following commit has been merged in the webkit-1.1 branch:
commit 6d51bf2207e349c6e6acbd4529dbbed3e3a1d7e4
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 22:32:57 2009 +0000

    2009-12-09  Andreas Kling  <andreas.kling at nokia.com>
    
            Reviewed by Brady Eidson.
    
            Fixed a typo in http://trac.webkit.org/changeset/51644 that broke
            the QWebPage autotest.
    
            No new test required.
    
            * loader/FrameLoader.cpp:
            (WebCore::FrameLoader::navigateToDifferentDocument):
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51924 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index 28636d5..255b9fd 100644
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2009-12-09  Andreas Kling  <andreas.kling at nokia.com>
+
+        Reviewed by Brady Eidson.
+
+        Fixed a typo in http://trac.webkit.org/changeset/51644 that broke
+        the QWebPage autotest.
+
+        No new test required.
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::navigateToDifferentDocument):
+
 2009-12-09  Robert Hogan  <robert at roberthogan.net>
 
         Reviewed by Eric Seidel.
diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 2047c8d..a1bfe8f 100644
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -3760,7 +3760,7 @@ void FrameLoader::navigateToDifferentDocument(HistoryItem* item, FrameLoadType l
             case FrameLoadTypeBackWMLDeckNotAccessible:
             case FrameLoadTypeForward:
             case FrameLoadTypeIndexedBackForward:
-                if (itemURL.protocolIs("https"))
+                if (!itemURL.protocolIs("https"))
                     request.setCachePolicy(ReturnCacheDataElseLoad);
                 break;
             case FrameLoadTypeStandard:

-- 
WebKit Debian packaging