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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 1502bfb59c801335f957adb3fbd67b8defb68dbe
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 12 22:27:15 2002 +0000

            * khtml/misc/loader.cpp: (Cache::insertInLRUList):
    	Add missing piece of the last check-in.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1802 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 6fc40ee..d26f52a 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,10 @@
 2002-08-12  Darin Adler  <darin at apple.com>
 
+        * khtml/misc/loader.cpp: (Cache::insertInLRUList):
+	Add missing piece of the last check-in.
+
+2002-08-12  Darin Adler  <darin at apple.com>
+
 	At Ken's urging, fixed the loader cache to be more efficient.
 	Gives 1% on the cvs-base test.
 
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 6fc40ee..d26f52a 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,10 @@
 2002-08-12  Darin Adler  <darin at apple.com>
 
+        * khtml/misc/loader.cpp: (Cache::insertInLRUList):
+	Add missing piece of the last check-in.
+
+2002-08-12  Darin Adler  <darin at apple.com>
+
 	At Ken's urging, fixed the loader cache to be more efficient.
 	Gives 1% on the cvs-base test.
 
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 6fc40ee..d26f52a 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,10 @@
 2002-08-12  Darin Adler  <darin at apple.com>
 
+        * khtml/misc/loader.cpp: (Cache::insertInLRUList):
+	Add missing piece of the last check-in.
+
+2002-08-12  Darin Adler  <darin at apple.com>
+
 	At Ken's urging, fixed the loader cache to be more efficient.
 	Gives 1% on the cvs-base test.
 
diff --git a/WebCore/khtml/misc/loader.cpp b/WebCore/khtml/misc/loader.cpp
index abca575..bd59d05 100644
--- a/WebCore/khtml/misc/loader.cpp
+++ b/WebCore/khtml/misc/loader.cpp
@@ -1745,6 +1745,9 @@ void Cache::insertInLRUList(CachedObject *object)
 {
     removeFromLRUList(object);
     
+    if (!object->allowInLRUList())
+        return;
+    
     bool uncacheable = object->status() == CachedObject::Uncacheable;
     CachedObject *&head = uncacheable ? m_headOfUncacheableList : m_headOfLRUList;
 

-- 
WebKit Debian packaging