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

[trey]

The following commit has been merged in the debian/unstable branch:
commit 8807f2f1065891258c2ccfeca1c87ee7bb101147
Author: trey <trey at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 8 21:33:50 2003 +0000

    	3136213 - Page loads stopped by backtracking don't finish when moving forward
    
    	We need to remove the entry from the KHTML image cache when a load
    	has an error, so it will be reloaded next time we try.
    
            Reviewed by Darin,
    
            * khtml/misc/loader.cpp:
            (Loader::slotFinished):  Remove cache entry on job error.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3278 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 4ed189e..48ae844 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,3 +1,15 @@
+2003-01-08  Trey Matteson  <trey at apple.com>
+
+	3136213 - Page loads stopped by backtracking don't finish when moving forward
+
+	We need to remove the entry from the KHTML image cache when a load
+	has an error, so it will be reloaded next time we try.	
+
+        Reviewed by Darin,
+
+        * khtml/misc/loader.cpp:
+        (Loader::slotFinished):  Remove cache entry on job error.
+
 2003-01-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 4ed189e..48ae844 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,15 @@
+2003-01-08  Trey Matteson  <trey at apple.com>
+
+	3136213 - Page loads stopped by backtracking don't finish when moving forward
+
+	We need to remove the entry from the KHTML image cache when a load
+	has an error, so it will be reloaded next time we try.	
+
+        Reviewed by Darin,
+
+        * khtml/misc/loader.cpp:
+        (Loader::slotFinished):  Remove cache entry on job error.
+
 2003-01-08  Darin Adler  <darin at apple.com>
 
         Reviewed by Dave.
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index 98846cf..095ee3b 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -1265,7 +1265,9 @@ kdDebug(6060) << "Loader::slotFinished, url = " << j->url().url() << " expires "
 
 #if APPLE_CHANGES
   // We don't want to ever finish the load in the case of an error because we don't want them cached.
-  if (!j->error())
+  if (j->error())
+      Cache::removeCacheEntry( r->object );
+  else
 #endif
   r->object->finish();
 

-- 
WebKit Debian packaging