[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 f16703223b1c074518f6b6fc052af77030f91f7b
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jul 27 20:13:14 2004 +0000

    WebKit:
    
            Reviewed by Trey.
    
            WebKit part of fix for <rdar://problem/3622268> Reload failed pages when a
            network problem is corrected, inc. using Network Diagnostics
    
            * WebView.subproj/WebFrame.m:
            (-[WebFrame reload]):
            This method did not handle unreachableURLs at all. The reason Safari's Reload
            did work with unreachableURLs was that Safari does "reloadObeyingLocationField"
            which never actually calls -[WebFrame reload]. Fixed by creating a fresh
            request for the previously-unreachable URL.
    
    WebBrowser:
    
            Reviewed by Trey.
    
            - part of fix for <rdar://problem/3622268> Reload failed pages when a network
            problem is corrected, inc. using Network Diagnostics
    
            We don't actually use Network Diagnostics yet, but we now react to network
            configuration changes by reloading any error pages. Using Network Diagnostics
            is the remaining part of 3622268.
    
            * NetworkController.h: Added. New file, copied and simplified from Message project.
            * NetworkController.m: Added. New file, copied and simplified from Message project.
            (+[NetworkController sharedInstance]):
            returns singleton instance
            (-[NetworkController dealloc]):
            release ivars
            (-[NetworkController init]):
            call _listenForNetworkChanges
            (-[NetworkController _postNetworkChangeNotification:]):
            post notification that network configuration changed
            (_networkChangeCallBack):
            call _postNetworkChangeNotification after a delay to coalesce multiple
            SystemConfiguration callbacks
            (_listenForNetworkChanges):
            register with SystemConfiguration for network changes
    
            * BrowserWebController.h:
            new ivar _registeredForNetworkConfigurationChanges
            * BrowserWebController.m:
            (-[BrowserWebView dealloc]):
            if registered for network config changes, remove appropriate observer
            (-[BrowserWebView networkConfigurationDidChange:]):
            reload main frame if it's showing an unreachable URL
            (-[BrowserWebView showErrorPageForURL:withTitle:message:]):
            register for network config changes if necessary
    
            * WebBrowser.pbproj/project.pbxproj:
            updated for new files and for including the SystemConfiguration framework
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@7130 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 08adea6..e1e8023 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,17 @@
+2004-07-27  John Sullivan  <sullivan at apple.com>
+
+        Reviewed by Trey.
+        
+        WebKit part of fix for <rdar://problem/3622268> Reload failed pages when a 
+        network problem is corrected, inc. using Network Diagnostics
+
+        * WebView.subproj/WebFrame.m:
+        (-[WebFrame reload]):
+        This method did not handle unreachableURLs at all. The reason Safari's Reload
+        did work with unreachableURLs was that Safari does "reloadObeyingLocationField"
+        which never actually calls -[WebFrame reload]. Fixed by creating a fresh
+        request for the previously-unreachable URL.
+
 2004-07-26  Richard Williamson   <rjw at apple.com>
 
         Fixed 3739737.  When setting the focus to a NSView, set the focus
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 06c065e..d597e2b 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -2667,9 +2667,18 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
         return;
     }
 
+    NSMutableURLRequest *initialRequest = [dataSource request];
+
+    // Replace error-page URL with the URL we were trying to reach.
+    NSURL *unreachableURL = [initialRequest _webDataRequestUnreachableURL];
+    if (unreachableURL != nil) {
+        initialRequest = [NSURLRequest requestWithURL:unreachableURL];
+    }
+    
     // initWithRequest copies the request
-    WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:[dataSource request]];
+    WebDataSource *newDataSource = [[WebDataSource alloc] initWithRequest:initialRequest];
     NSMutableURLRequest *request = [newDataSource request];
+
     [request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
 
     // If we're about to rePOST, set up action so the app can warn the user

-- 
WebKit Debian packaging