[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 31d4eb3fc622bb1bd211afe45acfe38ee27e60aa
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 16 23:40:30 2003 +0000

    	Fixed: <rdar://problem/3455176>: Assertion failure when loading non-existant plug-in content
    
            Reviewed by rjw.
    
            * Misc.subproj/WebDownload.m: fixed build failure when using new Foundation. We are overriding and calling a renamed method. Continue to override the old method, override the new method and declare their interfaces to avoid build failures.
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginConnectionDelegate connection:didReceiveResponse:]): cancel the load before telling the plug-in about the error so plug-in code doesn't attempt to cancel the load twice
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5197 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ecceb38..8a6b6b2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-10-16  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3455176>: Assertion failure when loading non-existant plug-in content
+
+        Reviewed by rjw.
+
+        * Misc.subproj/WebDownload.m: fixed build failure when using new Foundation. We are overriding and calling a renamed method. Continue to override the old method, override the new method and declare their interfaces to avoid build failures. 
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginConnectionDelegate connection:didReceiveResponse:]): cancel the load before telling the plug-in about the error so plug-in code doesn't attempt to cancel the load twice
+
 2003-10-16  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3453991.  We weren't setting the array cursor correctly after changing
diff --git a/WebKit/Misc.subproj/WebDownload.m b/WebKit/Misc.subproj/WebDownload.m
index a269bdb..7e0dbc8 100644
--- a/WebKit/Misc.subproj/WebDownload.m
+++ b/WebKit/Misc.subproj/WebDownload.m
@@ -9,6 +9,20 @@
 #import <Foundation/NSURLDownloadPrivate.h>
 #import <WebKit/WebPanelAuthenticationHandler.h>
 
+// FIXME: Remove these declarations because _initWithLoadingConnection is declared in NSURLDownloadPrivate.h
+ at interface NSURLDownload (WebDownloadCapability)
+- (id)_initWithLoadingConnection:(NSURLConnection *)connection
+                         request:(NSURLRequest *)request
+                        response:(NSURLResponse *)response
+                        delegate:(id)delegate
+                           proxy:(NSURLConnectionDelegateProxy *)proxy;
+- (id)_initWithLoadingResource:(NSURLConnection *)connection
+                       request:(NSURLRequest *)request
+                      response:(NSURLResponse *)response
+                      delegate:(id)delegate
+                         proxy:(NSURLConnectionDelegateProxy *)proxy;
+ at end
+
 @interface WebDownloadInternal : NSObject
 {
 @public
@@ -164,6 +178,19 @@
     return self;
 }
 
+- (id)_initWithLoadingConnection:(NSURLConnection *)connection
+                         request:(NSURLRequest *)request
+                        response:(NSURLResponse *)response
+                        delegate:(id)delegate
+                           proxy:(NSURLConnectionDelegateProxy *)proxy;
+{
+    self = [self init];
+    [_webInternal setRealDelegate:delegate];
+    [super _initWithLoadingConnection:connection request:request response:response delegate:_webInternal proxy:proxy];
+    return self;
+}
+
+// FIXME: Remove this override because it no longer exists in newer Foundations.
 - (id)_initWithLoadingResource:(NSURLConnection *)connection
                        request:(NSURLRequest *)request
                       response:(NSURLResponse *)response
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 5c6ce04..0cbd7c9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -109,11 +109,11 @@
     [super connection:con didReceiveResponse:theResponse];
     if ([theResponse isKindOfClass:[NSHTTPURLResponse class]] &&
         [NSHTTPURLResponse isErrorStatusCode:[(NSHTTPURLResponse *)theResponse statusCode]]) {
-        [stream cancelWithReason:NPRES_NETWORK_ERR];
         NSError *error = [NSError _webKitErrorWithDomain:NSURLErrorDomain
                                                     code:NSURLErrorFileDoesNotExist
                                                      URL:[theResponse URL]];
         [self cancelWithError:error];
+        [stream cancelWithReason:NPRES_NETWORK_ERR];
     }
     [self release];
 }

-- 
WebKit Debian packaging