[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[darin]

The following commit has been merged in the debian/unstable branch:
commit 514fd653599be3ec2a4afd80d7db6b2e783949d1
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 10 05:43:02 2002 +0000

    	- fixed 3071799 -- REGRESSION: hang and strange download loading about:blank
    
    	Chris fixed the strange download earlier. This fixes the "hang' by making sure
    	we commit even if we receive 0 bytes of data.
    
            * WebView.subproj/WebDataSourcePrivate.h: Added a _finishedLoading method.
            * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _finishedLoading]):
    	Added. Sets the "first byte of data received" flag, and calls _commitIfReady.
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handleDidFinishLoading:]): Call _finishedLoading.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2297 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index dd877ec..2be98af 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2002-10-10  Darin Adler  <darin at apple.com>
 
+	- fixed 3071799 -- REGRESSION: hang and strange download loading about:blank
+
+	Chris fixed the strange download earlier. This fixes the "hang' by making sure
+	we commit even if we receive 0 bytes of data.
+
+        * WebView.subproj/WebDataSourcePrivate.h: Added a _finishedLoading method.
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _finishedLoading]):
+	Added. Sets the "first byte of data received" flag, and calls _commitIfReady.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:]): Call _finishedLoading.
+
+2002-10-10  Darin Adler  <darin at apple.com>
+
 	- fixed 3072015 -- REGRESSION: frames multiply endlessly
 
         * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setFrame:]):
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index dd877ec..2be98af 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,18 @@
 2002-10-10  Darin Adler  <darin at apple.com>
 
+	- fixed 3071799 -- REGRESSION: hang and strange download loading about:blank
+
+	Chris fixed the strange download earlier. This fixes the "hang' by making sure
+	we commit even if we receive 0 bytes of data.
+
+        * WebView.subproj/WebDataSourcePrivate.h: Added a _finishedLoading method.
+        * WebView.subproj/WebDataSourcePrivate.m: (-[WebDataSource _finishedLoading]):
+	Added. Sets the "first byte of data received" flag, and calls _commitIfReady.
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handleDidFinishLoading:]): Call _finishedLoading.
+
+2002-10-10  Darin Adler  <darin at apple.com>
+
 	- fixed 3072015 -- REGRESSION: frames multiply endlessly
 
         * WebCoreSupport.subproj/WebBridge.m: (-[WebBridge setFrame:]):
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.h b/WebKit/WebView.subproj/WebDataSourcePrivate.h
index a4bdc31..e664425 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.h
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.h
@@ -117,6 +117,7 @@
 - (void)_commitIfReady;
 - (void)_makeRepresentation;
 - (void)_receivedData:(NSData *)data;
+- (void)_finishedLoading;
 
 - (void)_defersCallbacksChanged;
 
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index b6b140d..9b9364e 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -434,6 +434,12 @@
     [[[[self webFrame] webView] documentView] dataSourceUpdated:self];
 }
 
+- (void)_finishedLoading
+{
+    _private->gotFirstByte = YES;
+    [self _commitIfReady];
+}
+
 - (void)iconLoader:(WebIconLoader *)iconLoader receivedPageIcon:(NSImage *)icon;
 {
     [[WebIconDatabase sharedIconDatabase] _setIconURL:[iconLoader URL] forSiteURL:[self URL]];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 748d710..fb86ad0 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -160,8 +160,8 @@
     WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
     
     // Don't retain data for downloaded files
-    if(contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally){
-       [dataSource _setResourceData:resourceData];
+    if (contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally) {
+    	[dataSource _setResourceData:resourceData];
     }
 
     if (contentAction == WebContentPolicyShow) {
@@ -177,8 +177,10 @@
         downloadHandler = nil;
         [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
     }
-    else
+    else {
+        [dataSource _finishedLoading];
         [resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
+    }
 
     // Either send a final error message or a final progress message.
     WebError *nonTerminalError = [[dataSource response] error];
@@ -189,7 +191,6 @@
     }
     
     [self didStopLoading];
-
     
     [self release];
 }
@@ -284,7 +285,6 @@
     
     WebError *downloadError = nil;
     
-
     if (downloadHandler) {
         downloadError = [downloadHandler receivedData:data];
         [downloadProgressDelegate resourceRequest: request didReceiveContentLength: [data length] fromDataSource:dataSource];
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 748d710..fb86ad0 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -160,8 +160,8 @@
     WebContentAction contentAction = [[dataSource contentPolicy] policyAction];
     
     // Don't retain data for downloaded files
-    if(contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally){
-       [dataSource _setResourceData:resourceData];
+    if (contentAction != WebContentPolicySave && contentAction != WebContentPolicySaveAndOpenExternally) {
+    	[dataSource _setResourceData:resourceData];
     }
 
     if (contentAction == WebContentPolicyShow) {
@@ -177,8 +177,10 @@
         downloadHandler = nil;
         [downloadProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
     }
-    else
+    else {
+        [dataSource _finishedLoading];
         [resourceProgressDelegate resourceRequest:[handle _request] didFinishLoadingFromDataSource:dataSource];
+    }
 
     // Either send a final error message or a final progress message.
     WebError *nonTerminalError = [[dataSource response] error];
@@ -189,7 +191,6 @@
     }
     
     [self didStopLoading];
-
     
     [self release];
 }
@@ -284,7 +285,6 @@
     
     WebError *downloadError = nil;
     
-
     if (downloadHandler) {
         downloadError = [downloadHandler receivedData:data];
         [downloadProgressDelegate resourceRequest: request didReceiveContentLength: [data length] fromDataSource:dataSource];

-- 
WebKit Debian packaging