2007-12-12 MorganL <morganl.webkit@yahoo.com> -- http://bugs.webkit.org/show_bug...

        Reviewed by Maciej.

        Fixes:
        http://bugs.webkit.org/show_bug.cgi?id=16408

        When navigating back/forward to a http:// link, we should prefer to
        load from cache if possible.

        * loader/FrameLoader.cpp:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@28662 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog b/WebCore/ChangeLog
index b1d196fa843e320e69e80c03e65def9820874d6f..a59c53b92eea333d66981b171041c68598349594 100644 (file)
--- a/WebCore/ChangeLog
+++ b/WebCore/ChangeLog
@@ -1,3 +1,15 @@
+2007-12-12  MorganL  <morganl.webkit@yahoo.com>
+
+        Reviewed by Maciej.
+
+        Fixes:
+        http://bugs.webkit.org/show_bug.cgi?id=16408
+
+        When navigating back/forward to a http:// link, we should prefer to
+        load from cache if possible.
+
+        * loader/FrameLoader.cpp:
+
 2007-12-12  Anders Carlsson  <andersca@apple.com>
 
         Reviewed by Sam.

diff --git a/WebCore/loader/FrameLoader.cpp b/WebCore/loader/FrameLoader.cpp
index 632049d24bba45d7c920e974f799313de502b5e5..e2642112b83a3afe0d92a78afe847ddf2e480fb7 100644 (file)
--- a/WebCore/loader/FrameLoader.cpp
+++ b/WebCore/loader/FrameLoader.cpp
@@ -4058,7 +4058,7 @@ void FrameLoader::loadItem(HistoryItem* item, FrameLoadType loadType)
                     case FrameLoadTypeBack:
                     case FrameLoadTypeForward:
                     case FrameLoadTypeIndexedBackForward:
-                        if (itemURL.protocol() == "https")
+                        if (itemURL.protocol() != "https")
                             request.setCachePolicy(ReturnCacheDataElseLoad);
                         break;
                     case FrameLoadTypeStandard: