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

[sullivan]

The following commit has been merged in the debian/unstable branch:
commit 82a9ef4cf66137c08668444cda8dd4a3e6432c9c
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jun 24 18:22:25 2004 +0000

            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
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@6911 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index ff417fd..7475bcc 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2004-06-24  John Sullivan  <sullivan at 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 at apple.com>
 
 		Implemented changes for latest npruntime.h.
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 9ab324b..eb0cf8a 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -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];

-- 
WebKit Debian packaging