[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 b26ce3ec66fb9e463950fa843627af39a2a22717
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 11 05:03:09 2002 +0000

    	Fixed: 3124079 - REGRESSION: Downloads never complete
    
            Reviewed by darin.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidFinishLoading:]): release and set to nil the download handler after calling [super handleDidFinishLoading:h]
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2993 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 0fcfba9..60f89f0 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2002-12-10  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: 3124079 - REGRESSION: Downloads never complete
+
+        Reviewed by darin.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:]): release and set to nil the download handler after calling [super handleDidFinishLoading:h]
+
 2002-12-10  Richard Williamson   <rjw at apple.com>
 
         Fixed 3115427.  Page now draws instantly instead of 20 seconds.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 936dab1..43a3ed8 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -308,8 +308,6 @@
     if (downloadHandler) {
         downloadError = [downloadHandler finishedLoading];
         [dataSource _setPrimaryLoadComplete:YES];
-        [downloadHandler release];
-        downloadHandler = nil;
     } else {
         [dataSource _setResourceData:resourceData];
         [dataSource _finishedLoading];
@@ -324,6 +322,9 @@
         [super handleDidFinishLoading:h];
     }
 
+    [downloadHandler release];
+    downloadHandler = nil;
+    
     [self release];
 }
 
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 936dab1..43a3ed8 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -308,8 +308,6 @@
     if (downloadHandler) {
         downloadError = [downloadHandler finishedLoading];
         [dataSource _setPrimaryLoadComplete:YES];
-        [downloadHandler release];
-        downloadHandler = nil;
     } else {
         [dataSource _setResourceData:resourceData];
         [dataSource _finishedLoading];
@@ -324,6 +322,9 @@
         [super handleDidFinishLoading:h];
     }
 
+    [downloadHandler release];
+    downloadHandler = nil;
+    
     [self release];
 }
 

-- 
WebKit Debian packaging