[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 3583a5ab6a023234de47e267d346154116f14358
Author: cblu <cblu at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Mar 2 00:04:20 2004 +0000

    	Found a bug in my last check-in. If a load that originates from a WebResource is cancelled before the data from the WebResource is delivered, callbacks are sent anyway.
    
            Reviewed by rjw.
    
            * WebView.subproj/WebBaseResourceHandleDelegate.m:
            (-[WebBaseResourceHandleDelegate cancelWithError:]): cancel the perform request for deliverResource
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6145 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3a46140..46bf192 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2004-03-01  Chris Blumenberg  <cblu at apple.com>
 
+	Found a bug in my last check-in. If a load that originates from a WebResource is cancelled before the data from the WebResource is delivered, callbacks are sent anyway. 
+
+        Reviewed by rjw.
+
+        * WebView.subproj/WebBaseResourceHandleDelegate.m:
+        (-[WebBaseResourceHandleDelegate cancelWithError:]): cancel the perform request for deliverResource
+
+2004-03-01  Chris Blumenberg  <cblu at apple.com>
+
         Reviewed by darin.
 
         * Misc.subproj/WebIconLoader.m:
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 06a1d6d..cee26e1 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -517,6 +517,7 @@
     [currentWebChallenge release];
     currentWebChallenge = nil;
 
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(deliverResource) object:nil];
     [connection cancel];
 
     [webView _completeProgressForConnectionDelegate:self];
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 06a1d6d..cee26e1 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -517,6 +517,7 @@
     [currentWebChallenge release];
     currentWebChallenge = nil;
 
+    [NSObject cancelPreviousPerformRequestsWithTarget:self selector:@selector(deliverResource) object:nil];
     [connection cancel];
 
     [webView _completeProgressForConnectionDelegate:self];

-- 
WebKit Debian packaging