[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 c306ebfa05ae1bcafa4787627594e32172e96980
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 8 17:40:23 2003 +0000

    	Fixed: <rdar://problem/3478022>: assertion failure while loading WMP content
    
            Reviewed by darin.
    
            * ChangeLog:
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginConnectionDelegate connection:didReceiveResponse:]): Don't continue if the stream is cancelled in startStreamWithResponse.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 54720e2..11b94f7 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-11-08  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3478022>: assertion failure while loading WMP content
+
+        Reviewed by darin.
+
+        * ChangeLog:
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginConnectionDelegate connection:didReceiveResponse:]): Don't continue if the stream is cancelled in startStreamWithResponse.
+
 2003-11-07  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3477067.  Use our case unicode conversion routines.
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index ad0d1b9..d8373b9 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -106,14 +106,20 @@
     // anything including possibly releasing self; one example of this is 3266216
     [self retain];
     [stream startStreamWithResponse:theResponse];
-    [super connection:con didReceiveResponse:theResponse];
-    if ([theResponse isKindOfClass:[NSHTTPURLResponse class]] &&
-        [NSHTTPURLResponse isErrorStatusCode:[(NSHTTPURLResponse *)theResponse statusCode]]) {
-        NSError *error = [NSError _webKitErrorWithDomain:NSURLErrorDomain
-                                                    code:NSURLErrorFileDoesNotExist
-                                                     URL:[theResponse URL]];
-        [stream receivedError:error];
-        [self cancelWithError:error];
+    
+    // Don't continue if the stream is cancelled in startStreamWithResponse or didReceiveResponse.
+    if (stream) {
+        [super connection:con didReceiveResponse:theResponse];
+        if (stream) {
+            if ([theResponse isKindOfClass:[NSHTTPURLResponse class]] &&
+                [NSHTTPURLResponse isErrorStatusCode:[(NSHTTPURLResponse *)theResponse statusCode]]) {
+                NSError *error = [NSError _webKitErrorWithDomain:NSURLErrorDomain
+                                                            code:NSURLErrorFileDoesNotExist
+                                                            URL:[theResponse URL]];
+                [stream receivedError:error];
+                [self cancelWithError:error];
+            }
+        }
     }
     [self release];
 }

-- 
WebKit Debian packaging