[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[rjw]

The following commit has been merged in the debian/unstable branch:
commit afb789f498eb21b0cff821a6191a7f62263b04b0
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 2 01:14:13 2003 +0000

            Correct fix for 3137430 that doesn't always effectively disable
            the cache.
    
            Reviewed by kocienda.
    
            * History.subproj/WebHistoryItem.m:
            * WebView.subproj/WebFramePrivate.m:
            (-[WebFrame _continueLoadRequestAfterNavigationPolicy:request:]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3227 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 40aeb0e..0262e69 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2003-01-01  Richard Williamson   <rjw at apple.com>
 
+        Correct fix for 3137430 that doesn't always effectively disable
+        the cache.
+        
+        Reviewed by kocienda.
+
+        * History.subproj/WebHistoryItem.m:
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _continueLoadRequestAfterNavigationPolicy:request:]):
+
+2003-01-01  Richard Williamson   <rjw at apple.com>
+
         Don't reset the cookie policy URL if it has already been set.  Fixes to 3109590.
         
         Reviewed by Maciej.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 6c90403..8bfe522 100644
--- a/WebKit/History.subproj/WebHistoryItem.m
+++ b/WebKit/History.subproj/WebHistoryItem.m
@@ -460,7 +460,7 @@ static NSTimer *_pageCacheReleaseTimer = nil;
 
 - (BOOL)hasPageCache;
 {
-    return pageCache != nil && [pageCache objectForKey:@"WebCorePageState"] != nil;
+    return pageCache != nil;
 }
 
 + (void)_invalidateReleaseTimer
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index d82e3f0..4755c33 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1707,8 +1707,11 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         loadType == WebFrameLoadTypeBack ||
         loadType == WebFrameLoadTypeIndexedBackForward) &&
         [[_private provisionalItem] hasPageCache]){
-        LOG (PageCache, "Restoring page from back/forward cache, %s\n", [[[[_private provisionalItem] URL] absoluteString] cString]);
-        [_private->provisionalDataSource _startLoading: [[_private provisionalItem] pageCache]];
+        NSDictionary *pageCache = [[_private provisionalItem] pageCache];
+        if ([pageCache objectForKey:@"WebCorePageState"]){
+            LOG (PageCache, "Restoring page from back/forward cache, %s\n", [[[[_private provisionalItem] URL] absoluteString] cString]);
+            [_private->provisionalDataSource _startLoading: pageCache];
+        }
     }
     else 
         [_private->provisionalDataSource startLoading];

-- 
WebKit Debian packaging