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

[darin]

The following commit has been merged in the debian/unstable branch:
commit 350f26f78d9022e36a9e79e6bfd80dfe644e00bc
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Dec 18 00:38:32 2003 +0000

            Reviewed by Richard.
    
            - fixed 3513274: REGRESSION: anchor navigation within frames with "Back" is broken at tivofaq.com
    
            * WebView.subproj/WebDataSource.m: (-[WebDataSource _setURL:]):
            Since this method is only used when you do a fragment scroll, we need to update
            the original request as well as the request. This ensure that the fragment gets
            recorded in the history item (which goes in the back/forward history).
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@5825 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 4f8b97f..d9f6826 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2003-12-17  Darin Adler  <darin at apple.com>
+
+        Reviewed by Richard.
+
+        - fixed 3513274: REGRESSION: anchor navigation within frames with "Back" is broken at tivofaq.com
+
+        * WebView.subproj/WebDataSource.m: (-[WebDataSource _setURL:]):
+        Since this method is only used when you do a fragment scroll, we need to update
+        the original request as well as the request. This ensure that the fragment gets
+        recorded in the history item (which goes in the back/forward history).
+
 === Safari-118 ===
 
 2003-12-17  John Sullivan  <sullivan at apple.com>
diff --git a/WebKit/WebView.subproj/WebDataSource.m b/WebKit/WebView.subproj/WebDataSource.m
index 05c778c..b9461cc 100644
--- a/WebKit/WebView.subproj/WebDataSource.m
+++ b/WebKit/WebView.subproj/WebDataSource.m
@@ -321,6 +321,11 @@
 
 - (void)_setURL:(NSURL *)URL
 {
+    NSMutableURLRequest *newOriginalRequest = [_private->originalRequestCopy mutableCopy];
+    [_private->originalRequestCopy release];
+    [newOriginalRequest setURL:URL];
+    _private->originalRequestCopy = newOriginalRequest;
+
     NSMutableURLRequest *newRequest = [_private->request mutableCopy];
     [_private->request release];
     [newRequest setURL:URL];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index ecbe321..28460df 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -276,7 +276,7 @@ NSString *WebPageCacheDocumentViewKey = @"WebPageCacheDocumentViewKey";
     NSURL *URL;
     WebHistoryItem *bfItem;
 
-    if (useOriginal && 1) {
+    if (useOriginal) {
         request = [dataSrc _originalRequest];
     }
     else {

-- 
WebKit Debian packaging