[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 1fe5354250e158364ca502b6c4c53fdb10db6b55
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 22 04:40:40 2002 +0000

    	Removed workaround for: 3093170 - Handle clients receive data with length 0
    
    	as it's now fixed.
    
            * Downloads.subproj/WebDownloadHandler.m:
            (-[WebDownloadHandler receivedData:]): remove workaround
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:didReceiveData:]): added asserts
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2820 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 8b20958..4f77161 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-11-21  Chris Blumenberg  <cblu at apple.com>
+
+	Removed workaround for: 3093170 - Handle clients receive data with length 0
+
+	as it's now fixed.
+
+        * Downloads.subproj/WebDownloadHandler.m:
+        (-[WebDownloadHandler receivedData:]): remove workaround
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveData:]): added asserts
+
 2002-11-21  Richard Williamson   <rjw at apple.com>
 
         A different fix to 3078065 that doesn't depend on the appkit's idea of
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 8b20958..4f77161 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-11-21  Chris Blumenberg  <cblu at apple.com>
+
+	Removed workaround for: 3093170 - Handle clients receive data with length 0
+
+	as it's now fixed.
+
+        * Downloads.subproj/WebDownloadHandler.m:
+        (-[WebDownloadHandler receivedData:]): remove workaround
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:didReceiveData:]): added asserts
+
 2002-11-21  Richard Williamson   <rjw at apple.com>
 
         A different fix to 3078065 that doesn't depend on the appkit's idea of
diff --git a/WebKit/Downloads.subproj/WebDownload.m b/WebKit/Downloads.subproj/WebDownload.m
index 7bc9edb..c769e59 100644
--- a/WebKit/Downloads.subproj/WebDownload.m
+++ b/WebKit/Downloads.subproj/WebDownload.m
@@ -307,11 +307,6 @@
 - (WebError *)receivedData:(NSData *)data
 {
     ASSERT(data);
-
-    if ([data length] == 0) {
-        // Workaround for 3093170.
-        return nil;
-    }
     
     return [self decodeData:[self dataIfDoneBufferingData:data]];
 }
diff --git a/WebKit/Downloads.subproj/WebDownloadHandler.m b/WebKit/Downloads.subproj/WebDownloadHandler.m
index 7bc9edb..c769e59 100644
--- a/WebKit/Downloads.subproj/WebDownloadHandler.m
+++ b/WebKit/Downloads.subproj/WebDownloadHandler.m
@@ -307,11 +307,6 @@
 - (WebError *)receivedData:(NSData *)data
 {
     ASSERT(data);
-
-    if ([data length] == 0) {
-        // Workaround for 3093170.
-        return nil;
-    }
     
     return [self decodeData:[self dataIfDoneBufferingData:data]];
 }
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 4c5a501..fc0d8b5 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -256,8 +256,11 @@
 
 - (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
 {
-    LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
+    ASSERT(data);
+    ASSERT([data length] != 0);
 
+    LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
+    
     if (downloadHandler) {
         WebError *downloadError = [downloadHandler receivedData:data];
         if (downloadError) {
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 4c5a501..fc0d8b5 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -256,8 +256,11 @@
 
 - (void)handle:(WebResourceHandle *)h didReceiveData:(NSData *)data
 {
-    LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
+    ASSERT(data);
+    ASSERT([data length] != 0);
 
+    LOG(Loading, "URL = %@, data = %p, length %d", [dataSource URL], data, [data length]);
+    
     if (downloadHandler) {
         WebError *downloadError = [downloadHandler receivedData:data];
         if (downloadError) {

-- 
WebKit Debian packaging