[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 8efd28a29f06b43e1dc0f903d1a6392fdc5f38e3
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Aug 7 21:32:10 2003 +0000

    	Fixed: <rdar://problem/3330742>: 1.0 Safari fails to send NPP_URLNotify with the error of NPRES_NETWORK_ERR to Flash
    
            Reviewed by darin.
    
            * Plugins.subproj/WebBaseNetscapePluginStream.m:
            (-[WebBaseNetscapePluginStream destroyStreamWithReason:]): call NPP_URLNotify so we cover both the failure and successful cases
            (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): have destroyStreamWithReason call NPP_URLNotify
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4788 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 090734e..b17be55 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-08-07  Chris Blumenberg  <cblu at apple.com>
+
+	Fixed: <rdar://problem/3330742>: 1.0 Safari fails to send NPP_URLNotify with the error of NPRES_NETWORK_ERR to Flash
+
+        Reviewed by darin.
+
+        * Plugins.subproj/WebBaseNetscapePluginStream.m:
+        (-[WebBaseNetscapePluginStream destroyStreamWithReason:]): call NPP_URLNotify so we cover both the failure and successful cases
+        (-[WebBaseNetscapePluginStream finishedLoadingWithData:]): have destroyStreamWithReason call NPP_URLNotify
+
 2003-08-07  Ken Kocienda  <kocienda at apple.com>
 
         Reviewed by Darin
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
index a6d64a7..b2e5bbe 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginStream.m
@@ -149,7 +149,13 @@
     NPError npErr;
     npErr = NPP_DestroyStream(instance, &stream, reason);
     LOG(Plugins, "NPP_DestroyStream: %d", npErr);
+    
     stream.ndata = nil;
+        
+    if (notifyData) {
+        NPP_URLNotify(instance, [URL _web_URLCString], reason, notifyData);
+        LOG(Plugins, "NPP_URLNotify");
+    }
 }
 
 - (void)receivedError:(NPError)reason
@@ -197,11 +203,6 @@
     }
 
     [self destroyStreamWithReason:NPRES_DONE];
-    
-    if (notifyData) {
-        NPP_URLNotify(instance, [URL _web_URLCString], NPRES_DONE, notifyData);
-        LOG(Plugins, "NPP_URLNotify");
-    }
 }
 
 @end

-- 
WebKit Debian packaging