[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 5bfd52c0b6115f777943ea581eb5faca529bcb8a
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu May 15 21:59:24 2003 +0000

    WebFoundation:
    
    		Fixed: ASSERT if delegate doesn't implement didReceiveResponse
    
            Reviewed by kocienda.
    
            * CacheLoader.subproj/NSURLConnection.m:
            (-[NSURLConnection _postDidReceiveResponseCallback]): set didReceiveResponseCallbackSent to YES here
            (-[NSURLConnection _sendDidReceiveResponseCallback]): don't set didReceiveResponseCallbackSent to YES here because this method may not be called
    
    WebKit:
    
    		Fixed: 3199310 - No user agent included in favicon.ico requests
    
            Reviewed by kocienda.
    
            * Misc.subproj/WebIconLoader.h:
            * Misc.subproj/WebIconLoader.m:
            (-[WebIconLoaderPrivate dealloc]): use the request ivar
            (-[WebIconLoader URL]): ditto
            (-[WebIconLoader startLoading]): ditto
            (-[WebIconLoader connection:didReceiveData:]): ditto
            (-[WebIconLoader connectionDidFinishLoading:]): ditto
            * WebView.subproj/WebDataSourcePrivate.m:
            (-[WebDataSource _loadIcon]): create a icon loader with a request with the extra fields set
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4385 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 268298d..0daccb6 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,21 @@
 2003-05-15  Chris Blumenberg  <cblu at apple.com>
 
+		Fixed: 3199310 - No user agent included in favicon.ico requests
+
+        Reviewed by kocienda.
+
+        * Misc.subproj/WebIconLoader.h:
+        * Misc.subproj/WebIconLoader.m:
+        (-[WebIconLoaderPrivate dealloc]): use the request ivar
+        (-[WebIconLoader URL]): ditto
+        (-[WebIconLoader startLoading]): ditto
+        (-[WebIconLoader connection:didReceiveData:]): ditto
+        (-[WebIconLoader connectionDidFinishLoading:]): ditto
+        * WebView.subproj/WebDataSourcePrivate.m: 
+        (-[WebDataSource _loadIcon]): create a icon loader with a request with the extra fields set
+
+2003-05-15  Chris Blumenberg  <cblu at apple.com>
+
 	Fixed: 3155760 - Plug-in MIME and extension mapping should be case-insensitive
 
         Reviewed by john.
diff --git a/WebKit/Misc.subproj/WebIconLoader.h b/WebKit/Misc.subproj/WebIconLoader.h
index dffae9c..da9d8a2 100644
--- a/WebKit/Misc.subproj/WebIconLoader.h
+++ b/WebKit/Misc.subproj/WebIconLoader.h
@@ -5,6 +5,7 @@
 
 #import <Cocoa/Cocoa.h>
 
+ at class NSURLRequest;
 @class WebIconLoaderPrivate;
 
 /*!
@@ -16,16 +17,10 @@
 }
 
 /*!
-    @method iconLoaderWithURL:
-    @param URL
+    @method initWithRequest:
+    @param request
 */
-+ (id)iconLoaderWithURL:(NSURL *)URL;
-
-/*!
-    @method initWithURL:
-    @param URL
-*/
-- (id)initWithURL:(NSURL *)URL;
+- (id)initWithRequest:(NSURLRequest *)request;
 
 /*!
     @method URL
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 4fbe8b6..33a82e3 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -24,7 +24,7 @@
 @public
     NSURLConnection *handle;
     id delegate;
-    NSURL *URL;
+    NSURLRequest *request;
     NSMutableData *resourceData;
 }
 
@@ -34,7 +34,7 @@
 
 - (void)dealloc
 {
-    [URL release];
+    [request release];
     [handle release];
     [resourceData release];
     [super dealloc];
@@ -44,16 +44,11 @@
 
 @implementation WebIconLoader
 
-+ iconLoaderWithURL:(NSURL *)URL
-{
-    return [[[self alloc] initWithURL:URL] autorelease];
-}
-
-- initWithURL:(NSURL *)URL
+- (id)initWithRequest:(NSURLRequest *)request;
 {
     [super init];
     _private = [[WebIconLoaderPrivate alloc] init];
-    _private->URL = [URL retain];
+    _private->request = [request retain];
     _private->resourceData = [[NSMutableData alloc] init];
     return self;
 }
@@ -66,7 +61,7 @@
 
 - (NSURL *)URL
 {
-    return _private->URL;
+    return [_private->request URL];
 }
 
 - (id)delegate
@@ -84,13 +79,8 @@
     if (_private->handle != nil) {
         return;
     }
-    
-    // send this synthetic delegate callback since clients expect it, and
-    // we no longer send the callback from within NSURLConnection for
-    // initial requests.
-    NSURLRequest *request = [NSURLRequest requestWithURL:_private->URL];
-    request = [self connection:nil willSendRequest:request redirectResponse:nil];
-    _private->handle = [[NSURLConnection alloc] initWithRequest:request delegate:self];
+
+    _private->handle = [[NSURLConnection alloc] initWithRequest:_private->request delegate:self];
 }
 
 - (void)stopLoading
@@ -100,38 +90,21 @@
     _private->handle = nil;
 }
 
+- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
+{
+    [_private->resourceData appendData:data];
+}
+
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection
 {
     NSImage *icon = [[NSImage alloc] initWithData:_private->resourceData];
     if (icon) {
-        [[WebIconDatabase sharedIconDatabase] _setIcon:icon forIconURL:[_private->URL absoluteString]];
+        [[WebIconDatabase sharedIconDatabase] _setIcon:icon forIconURL:[[self URL] absoluteString]];
     } else {
-	[[WebIconDatabase sharedIconDatabase] _setHaveNoIconForIconURL:[_private->URL absoluteString]];
+	[[WebIconDatabase sharedIconDatabase] _setHaveNoIconForIconURL:[[self URL] absoluteString]];
     }
-    [_private->delegate _iconLoaderReceivedPageIcon:self];
+    [_private->delegate _iconLoaderReceivedPageIcon:self];    
     [icon release];
 }
 
-- (NSURLRequest *)connection:(NSURLConnection *)connection willSendRequest:(NSURLRequest *)request redirectResponse:(NSURLResponse *)redirectResponse
-{
-    return request;
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)theResponse
-{
-    // no-op
-
-    // no-op
-}
-
-- (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data
-{
-    [_private->resourceData appendData:data];
-}
-
-- (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)result
-{
-
-}
-
 @end
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 202721e..2c668cc 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -627,7 +627,10 @@
             [self _updateIconDatabaseWithURL:_private->iconURL];
         }else{
             ASSERT(!_private->iconLoader);
-            _private->iconLoader = [[WebIconLoader alloc] initWithURL:_private->iconURL];
+            NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:_private->iconURL];
+            [[self webFrame] _addExtraFieldsToRequest:request alwaysFromRequest:NO];
+            _private->iconLoader = [[WebIconLoader alloc] initWithRequest:request];
+            [request release];
             [_private->iconLoader setDelegate:self];
             [_private->iconLoader startLoading];
         }

-- 
WebKit Debian packaging