[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 070fa3bcffcb225cb8c813613b2c065e4450b224
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Sep 11 19:26:16 2002 +0000

            * WebView.subproj/WebFrame.m: (-[WebFrame reload:]): Use the current
    	URL, not the original URL, when doing a reload. This prevents the URL from
    	changing back and forth when you reload on a page that involved a redirect.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2036 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f8c8e7d..7999687 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,11 @@
 2002-09-11  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebFrame.m: (-[WebFrame reload:]): Use the current
+	URL, not the original URL, when doing a reload. This prevents the URL from
+	changing back and forth when you reload on a page that involved a redirect.
+
+2002-09-11  Darin Adler  <darin at apple.com>
+
 	Add machinery needed for fix to 3021137, changing font prefs
 	doesn't redraw frames other than the main frame.
 
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f8c8e7d..7999687 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,11 @@
 2002-09-11  Darin Adler  <darin at apple.com>
 
+        * WebView.subproj/WebFrame.m: (-[WebFrame reload:]): Use the current
+	URL, not the original URL, when doing a reload. This prevents the URL from
+	changing back and forth when you reload on a page that involved a redirect.
+
+2002-09-11  Darin Adler  <darin at apple.com>
+
 	Add machinery needed for fix to 3021137, changing font prefs
 	doesn't redraw frames other than the main frame.
 
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index f923cee..e9dbf87 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -198,7 +198,7 @@
 
     flags = [[dataSource request] flags] | WebResourceHandleFlagLoadFromOrigin;
 
-    WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:[dataSource originalURL] flags:flags];
+    WebDataSource *newDataSource = [[WebDataSource alloc] initWithURL:[dataSource URL] flags:flags];
     [newDataSource _setParent:[dataSource parent]];
     if ([self setProvisionalDataSource:newDataSource]) {
 	[self _setLoadType:WebFrameLoadTypeRefresh];

-- 
WebKit Debian packaging