[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677

[mjs]

The following commit has been merged in the debian/unstable branch:
commit 980b8f82fc38487c9cb19b8051ce433b9b96e9a2
Author: mjs <mjs at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 13 06:40:36 2004 +0000

            Reviewed by Kevin.
    
    	<rdar://problem/3673988>: (REGRESSION(141-144): connection assertion failure at http://traffic.511.org/sfgate)
    
            * WebView.subproj/WebBaseResourceHandleDelegate.m:
            (-[WebBaseResourceHandleDelegate connectionDidFinishLoading:]):
    	Don't check connection consistency if this load got cancelled
    	while finishing, because in this case we have cleared the
    	connection field already. This can happen when a redirect fires
    	from an onload handler.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 78f0c80..2a399d1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,18 @@
 2004-07-12  Maciej Stachowiak  <mjs at apple.com>
 
+        Reviewed by Kevin.
+
+	<rdar://problem/3673988>: (REGRESSION(141-144): connection assertion failure at http://traffic.511.org/sfgate)
+	
+        * WebView.subproj/WebBaseResourceHandleDelegate.m:
+        (-[WebBaseResourceHandleDelegate connectionDidFinishLoading:]):
+	Don't check connection consistency if this load got cancelled
+	while finishing, because in this case we have cleared the
+	connection field already. This can happen when a redirect fires
+	from an onload handler.
+
+2004-07-12  Maciej Stachowiak  <mjs at apple.com>
+
         Reviewed by John.
 
 	<rdar://problem/3632570>: (REGRESSION: SocialText.net wiki keeps asking for auth, even though pages load)
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 383f0f0..0c68801 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -498,7 +498,9 @@
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)con
 {
-    ASSERT(con == connection);
+    // don't worry about checking connection consistency if this load
+    // got cancelled while finishing.
+    ASSERT(cancelledFlag || con == connection);
     [self didFinishLoading];
 }
 
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 383f0f0..0c68801 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -498,7 +498,9 @@
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)con
 {
-    ASSERT(con == connection);
+    // don't worry about checking connection consistency if this load
+    // got cancelled while finishing.
+    ASSERT(cancelledFlag || con == connection);
     [self didFinishLoading];
 }
 

-- 
WebKit Debian packaging