Reviewed by Darin.
authorsullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Jun 2004 18:22:25 +0000 (18:22 +0000)
committersullivan <sullivan@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Thu, 24 Jun 2004 18:22:25 +0000 (18:22 +0000)
        - fixed <rdar://problem/3706792> 8A161: Choosing text encoding for
        error page opens finder window!?

        * WebView.subproj/WebFrame.m:
        (-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
        take unreachableURL into account

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@6911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKit/ChangeLog
WebKit/WebView.subproj/WebFrame.m

index ff417fdbd3bf0862fd8e13d2e83b2bcd46e85b86..7475bcc1a4da3ee9d39ed1d8f0ac18849340499c 100644 (file)
@@ -1,3 +1,14 @@
+2004-06-24  John Sullivan  <sullivan@apple.com>
+
+        Reviewed by Darin.
+        
+        - fixed <rdar://problem/3706792> 8A161: Choosing text encoding for 
+        error page opens finder window!?
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame _reloadAllowingStaleDataWithOverrideEncoding:]):
+        take unreachableURL into account
+
 2004-06-23  Richard Williamson   <rjw@apple.com>
 
                Implemented changes for latest npruntime.h.
index 9ab324b6f6223fe115858bb45b4fa7d6ef544c4f..eb0cf8a46ae2e5990d3951332ab1028fa8cdf367 100644 (file)
@@ -1991,6 +1991,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
     }
 
     NSMutableURLRequest *request = [[dataSource request] mutableCopy];
+    NSURL *unreachableURL = [dataSource unreachableURL];
+    if (unreachableURL != nil) {
+        [request setURL:unreachableURL];
+    }
     [request setCachePolicy:NSURLRequestReturnCacheDataElseLoad];
     WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:request];
     [request release];