[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 c0651c83b0c8e9100f9991d85f9db12990b4bd70
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 29 00:55:59 2003 +0000

            Reviewed by Maciej.
    
            - fixed 3344647 -- reachedTerminalState assertion in WebBaseResourceHandleDelegate.m
    
            * WebView.subproj/WebMainResourceClient.m: (-[WebMainResourceClient cancelWithError:]):
            Use [super cancelWithError:] rather than [self receivedError:]. I checked carefully to
            see that this code now does everything the old code did (and a bit more).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4725 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 5f1c2de..b182604 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,13 @@
+2003-07-28  Darin Adler  <darin at apple.com>
+
+        Reviewed by Maciej.
+
+        - fixed 3344647 -- reachedTerminalState assertion in WebBaseResourceHandleDelegate.m
+
+        * WebView.subproj/WebMainResourceClient.m: (-[WebMainResourceClient cancelWithError:]):
+        Use [super cancelWithError:] rather than [self receivedError:]. I checked carefully to
+        see that this code now does everything the old code did (and a bit more).
+
 2003-07-28  Richard Williamson   <rjw at apple.com>
 
 	Fixed 3341859. 
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 821b033..30d94c1 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -76,9 +76,12 @@
 
 -(void)cancelWithError:(NSError *)error
 {
+    // Calling _receivedError will likely result in a call to release, so we must retain.
+    [self retain];
     [self cancelContentPolicy];
-    [connection cancel];
-    [self receivedError:error];
+    [dataSource _receivedError:error complete:YES];
+    [super cancelWithError:error];
+    [self release];
 }
 
 - (NSError *)interruptForPolicyChangeError
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 821b033..30d94c1 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -76,9 +76,12 @@
 
 -(void)cancelWithError:(NSError *)error
 {
+    // Calling _receivedError will likely result in a call to release, so we must retain.
+    [self retain];
     [self cancelContentPolicy];
-    [connection cancel];
-    [self receivedError:error];
+    [dataSource _receivedError:error complete:YES];
+    [super cancelWithError:error];
+    [self release];
 }
 
 - (NSError *)interruptForPolicyChangeError

-- 
WebKit Debian packaging