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

[cblu]

The following commit has been merged in the debian/unstable branch:
commit a52e228ebe481be2ec26eca30bfd075d7cd916ec
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Mon Aug 19 20:46:38 2002 +0000

    	Fixed 3025019: "only-if-cached" attribute fetches data from network if cached but expired
    
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoader iconFromCache]):
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1868 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f842648..cea4799 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,10 @@
+2002-08-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed 3025019: "only-if-cached" attribute fetches data from network if cached but expired
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader iconFromCache]):
+
 2002-08-19  Darin Adler  <darin at apple.com>
 
 	- fixed 2863025 -- Need to implement TABing between widgets in forms
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f842648..cea4799 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,10 @@
+2002-08-19  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed 3025019: "only-if-cached" attribute fetches data from network if cached but expired
+
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoader iconFromCache]):
+
 2002-08-19  Darin Adler  <darin at apple.com>
 
 	- fixed 2863025 -- Need to implement TABing between widgets in forms
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 40522d1..451e584 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -127,11 +127,16 @@
 - (NSImage *)iconFromCache
 {
     NSImage *icon = [[self _icons] objectForKey:_private->URL];
+    
     if (icon) {
         return icon;
     }
+
+    NSDictionary *attributes, *headers;
+    
+    headers = [NSDictionary dictionaryWithObject:@"only-if-cached" forKey:@"Cache-Control"];
+    attributes = [NSDictionary dictionaryWithObject:headers forKey:WebHTTPResourceHandleRequestHeaders];
     
-    NSDictionary *attributes = [NSDictionary dictionaryWithObject:@"" forKey:@"only-if-cached"];
     WebResourceHandle *handle = [[WebResourceHandle alloc] initWithURL:_private->URL
                                                              userAgent:nil
                                                             attributes:attributes

-- 
WebKit Debian packaging