[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 4a05ba7d86e0628f6f882403a402643f9f985621
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 23 05:24:29 2002 +0000

    WebFoundation:
    
    	Fixed: 3026574 - .text is probably text too
    
            * types.plist: "text" is another extension for text/plain
    
    WebKit:
    
    	Fixed assertion while loading local files.
    
            * Misc.subproj/WebIconDatabase.m: we don't have icon URLs for files
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _loadIcon]): Only try loading favicon as the root of server if scheme is http or https. This isn't really a feature of other protocols.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2842 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index e48bc40..6a3ac76 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,4 +1,12 @@
-	2002-11-22  Chris Blumenberg  <cblu at apple.com>
+2002-11-22  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed assertion while loading local files.
+
+        * Misc.subproj/WebIconDatabase.m: we don't have icon URLs for files
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]): Only try loading favicon as the root of server if scheme is http or https. This isn't really a feature of other protocols.
+
+2002-11-22  Chris Blumenberg  <cblu at apple.com>
 
         * WebView.subproj/WebMainResourceClient.m:
         (-[WebMainResourceClient continueAfterContentPolicy:response:]): Added a FIXME around saveFilenameForResponse:andRequest: because the API expects a path but is asking for a filename.
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index e48bc40..6a3ac76 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,4 +1,12 @@
-	2002-11-22  Chris Blumenberg  <cblu at apple.com>
+2002-11-22  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed assertion while loading local files.
+
+        * Misc.subproj/WebIconDatabase.m: we don't have icon URLs for files
+        * WebView.subproj/WebDataSourcePrivate.m:
+        (-[WebDataSource _loadIcon]): Only try loading favicon as the root of server if scheme is http or https. This isn't really a feature of other protocols.
+
+2002-11-22  Chris Blumenberg  <cblu at apple.com>
 
         * WebView.subproj/WebMainResourceClient.m:
         (-[WebMainResourceClient continueAfterContentPolicy:response:]): Added a FIXME around saveFilenameForResponse:andRequest: because the API expects a path but is asking for a filename.
diff --git a/WebKit/Misc.subproj/WebIconDatabase.m b/WebKit/Misc.subproj/WebIconDatabase.m
index 2488d50..b02e3e4 100644
--- a/WebKit/Misc.subproj/WebIconDatabase.m
+++ b/WebKit/Misc.subproj/WebIconDatabase.m
@@ -328,12 +328,7 @@ NSSize WebIconLargeSize = {128, 128};
 
 - (BOOL)_hasIconForIconURL:(NSURL *)iconURL;
 {
-    if ([iconURL isFileURL] ||
-        [_private->iconURLToSiteURLs objectForKey:[iconURL absoluteString]]){
-        return YES;
-    }
-    
-    return NO;
+    return ([_private->iconURLToSiteURLs objectForKey:[iconURL absoluteString]] != nil);
 }
 
 - (NSMutableDictionary *)_iconsForIconURLString:(NSString *)iconURLString
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 284bf33..44d8263 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -502,9 +502,13 @@
     }
                 
     if(!_private->iconURL){
-        // No icon URL from the LINK tag so try the server's root
-        _private->iconURL = [[[NSURL _web_URLWithString:@"/favicon.ico"
-                                            relativeToURL:[self URL]] absoluteURL] retain];
+        // No icon URL from the LINK tag so try the server's root.
+        // This is only really a feature of http or https, so don't try this with other protocols.
+        NSString *scheme = [[self URL] scheme];
+        if([scheme isEqualToString:@"http"] || [scheme isEqualToString:@"https"]){
+            _private->iconURL = [[[NSURL _web_URLWithString:@"/favicon.ico"
+                                              relativeToURL:[self URL]] absoluteURL] retain];
+        }
     }
 
     if(_private->iconURL != nil){

-- 
WebKit Debian packaging