Changeset 30360 in webkit

Timestamp:

Feb 17, 2008 4:14:43 PM (16 years ago)

Author:

alp@webkit.org

Message:

2008-02-17 Adam Treat <​treat@kde.org>

Reviewed by Eric Seidel.

​http://bugs.webkit.org/show_bug.cgi?id=17008
Meta refresh does not work with cache turned off

Fix for issue noticed on ​http://adserver.vivox.com/2

• loader/FrameLoader.cpp: (WebCore::FrameLoader::changeLocation):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• loader/FrameLoader.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-02-17  Adam Treat  <treat@kde.org>
+
+        Reviewed by Eric Seidel.
+
+        http://bugs.webkit.org/show_bug.cgi?id=17008
+        Meta refresh does not work with cache turned off
+
+        Fix for issue noticed on http://adserver.vivox.com/2
+
+        * loader/FrameLoader.cpp:
+        (WebCore::FrameLoader::changeLocation):
+
 2008-02-17  Alp Toker  <alp@atoker.com>
 

trunk/WebCore/loader/FrameLoader.cpp

@@ -373 +373 @@
 void FrameLoader::changeLocation(const KURL& url, const String& referrer, bool lockHistory, bool userGesture)
 {
-    ResourceRequestCachePolicy policy = (m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)
+    ResourceRequestCachePolicy policy = !canCachePage() || (m_cachePolicy == CachePolicyReload) || (m_cachePolicy == CachePolicyRefresh)
         ? ReloadIgnoringCacheData : UseProtocolCachePolicy;
     ResourceRequest request(url, referrer, policy);