Reviewed by Kevin.
authormjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Jul 2004 06:40:36 +0000 (06:40 +0000)
committermjs <mjs@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 13 Jul 2004 06:40:36 +0000 (06:40 +0000)
<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: https://svn.webkit.org/repository/webkit/trunk@7015 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
WebKit/WebView.subproj/WebLoader.m

index 78f0c80..2a399d1 100644 (file)
@@ -1,5 +1,18 @@
 2004-07-12  Maciej Stachowiak  <mjs@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@apple.com>
+
         Reviewed by John.
 
        <rdar://problem/3632570>: (REGRESSION: SocialText.net wiki keeps asking for auth, even though pages load)
index 383f0f0..0c68801 100644 (file)
 
 - (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];
 }
 
index 383f0f0..0c68801 100644 (file)
 
 - (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];
 }