[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 a8df9fbf26d6c259ada14b0327cab2cf4a6b5a7c
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 1 20:45:30 2003 +0000

            Don't attempt to restore page from page cache if the cache
            doesn't contain valid page state.  This may happen after a
            redirect.  Fixes 3137430.
    
            Reviewed by kocienda.
    
            * History.subproj/WebHistoryItem.m:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3224 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index c33b8f0..3cbe80d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-01-01  Richard Williamson   <rjw at apple.com>
+
+        Don't attempt to restore page from page cache if the cache
+        doesn't contain valid page state.  This may happen after a
+        redirect.  Fixes 3137430.
+        
+        Reviewed by kocienda.
+
+        * History.subproj/WebHistoryItem.m:
+
 2002-12-31  Darin Adler  <darin at apple.com>
 
         Reviewed by Trey.
diff --git a/WebKit/History.subproj/WebHistoryItem.m b/WebKit/History.subproj/WebHistoryItem.m
index 8bfe522..6c90403 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;
+    return pageCache != nil && [pageCache objectForKey:@"WebCorePageState"] != nil;
 }
 
 + (void)_invalidateReleaseTimer

-- 
WebKit Debian packaging