[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 21cb2d561d3f42d0bed17358d2a59d04692d02d1
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 2 23:16:50 2003 +0000

    	Fixed: <rdar://problem/3440063>: Safari 1.1 won't load new pages after visiting adultswim.com, assertion failure on debug build
    
            Reviewed by rjw.
    
            * Plugins.subproj/WebBaseNetscapePluginStream.m:
            (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): if not data was received for a stream, create the temp file anyway. Plug-ins expect this.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5125 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f8d611e..bcd2111 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-02  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3440063>: Safari 1.1 won't load new pages after visiting adultswim.com, assertion failure on debug build
+
+        Reviewed by rjw.
+
+        * Plugins.subproj/WebBaseNetscapePluginStream.m:
+        (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): if not data was received for a stream, create the temp file anyway. Plug-ins expect this.
+
 === Safari-108 ===
 
 2003-10-02  Darin Adler  <darin at apple.com>
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index 229c190..ff3e59d 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -171,7 +171,7 @@
         return;
     }
     
-    if ((transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) && [data length] > 0 && !path) {
+    if ((transferMode == NP_ASFILE || transferMode == NP_ASFILEONLY) && !path) {
         path = strdup("/tmp/WebKitPlugInStreamXXXXXX");
         int fd = mkstemp(path);
         if (fd == -1) {
@@ -184,16 +184,18 @@
             return;
         }
         int dataLength = [data length];
-        int byteCount = write(fd, [data bytes], dataLength);
-        if (byteCount != dataLength) {
-            // This happens only rarely, when we are out of disk space or have a disk I/O error.
-            ERROR("error writing to temporary file, errno %d", errno);
-            close(fd);
-            // This is not a network error, but the only error codes are "network error" and "user break".
-            [self cancelWithReason:NPRES_NETWORK_ERR];
-            free(path);
-            path = NULL;
-            return;
+        if (dataLength > 0) {
+            int byteCount = write(fd, [data bytes], dataLength);
+            if (byteCount != dataLength) {
+                // This happens only rarely, when we are out of disk space or have a disk I/O error.
+                ERROR("error writing to temporary file, errno %d", errno);
+                close(fd);
+                // This is not a network error, but the only error codes are "network error" and "user break".
+                [self cancelWithReason:NPRES_NETWORK_ERR];
+                free(path);
+                path = NULL;
+                return;
+            }
         }
         close(fd);
     }

-- 
WebKit Debian packaging