[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 e0c1fc77191e73a3ff2e311d5234356a19b3671f
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Oct 17 23:35:58 2003 +0000

    WebKit:
    
    	Fixed: <rdar://problem/3456176>: Assertion failure when loading atomfilms.com
    
            Reviewed by kocienda.
    
            * Plugins.subproj/WebNetscapePluginStream.m:
            (-[WebNetscapePluginConnectionDelegate connection:didReceiveData:lengthReceived:]): call super before calling plug-in code as we do in other callbacks
            (-[WebNetscapePluginConnectionDelegate connectionDidFinishLoading:]): ditto
            (-[WebNetscapePluginConnectionDelegate connection:didFailWithError:]): ditto
    
    WebBrowser:
    
    	Fixed: <rdar://problem/3456246>: repro assertion failure in DowloadViewController pressing cmd-. when active download is not selected
    
            Reviewed by kocienda.
    
            * DownloadViewController.m:
            (-[DownloadViewController _stopSelection]): Removed the assertion because it is OK to call this method when there are no downloads to stop
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 117f77c..adc7100 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-17  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3456176>: Assertion failure when loading atomfilms.com
+
+        Reviewed by kocienda.
+
+        * Plugins.subproj/WebNetscapePluginStream.m:
+        (-[WebNetscapePluginConnectionDelegate connection:didReceiveData:lengthReceived:]): call super before calling plug-in code as we do in other callbacks
+        (-[WebNetscapePluginConnectionDelegate connectionDidFinishLoading:]): ditto
+        (-[WebNetscapePluginConnectionDelegate connection:didFailWithError:]): ditto
+
 2003-10-16  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3455306.  Ensure that progress is correctly ended when a load is interupted (i.e. becomes a download).
diff --git a/WebKit/Plugins.subproj/WebNetscapePluginStream.m b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
index 0cbd7c9..51a5e37 100644
--- a/WebKit/Plugins.subproj/WebNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebNetscapePluginStream.m
@@ -127,16 +127,16 @@
         [resourceData appendData:data];
     }
 
-    [stream receivedData:data];
     [super connection:con didReceiveData:data lengthReceived:lengthReceived];
+    [stream receivedData:data];
     [self release];
 }
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)con
 {
     [[view webView] _finishedLoadingResourceFromDataSource:[view dataSource]];
-    [stream finishedLoadingWithData:resourceData];
     [super connectionDidFinishLoading:con];
+    [stream finishedLoadingWithData:resourceData];
 }
 
 - (void)connection:(NSURLConnection *)con didFailWithError:(NSError *)result
@@ -145,8 +145,8 @@
     // anything including possibly releasing self; one example of this is 3266216
     [self retain];
     [[view webView] _receivedError:result fromDataSource:[view dataSource]];
-    [stream cancelWithReason:NPRES_NETWORK_ERR];
     [super connection:con didFailWithError:result];
+    [stream cancelWithReason:NPRES_NETWORK_ERR];
     [self release];
 }
 

-- 
WebKit Debian packaging