[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 99680e95c890c98d9a51928e071f96a65fa3c9dd
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 22:47:06 2002 +0000

    	- fixed 2969280 -- if trailing / not specified for site, relative URLs are
    	incorrectly expanded
    
            * WebCoreSupport.subproj/IFWebCoreBridge.mm:
            (-[IFWebCoreBridge receivedData:withDataSource:]): Update the URL for the
    	case where we've already been redirected before we receive any data.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1446 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 763f593..a8f701d 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2002-06-26  Darin Adler  <darin at apple.com>
 
+	- fixed 2969280 -- if trailing / not specified for site, relative URLs are
+	incorrectly expanded
+
+        * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+        (-[IFWebCoreBridge receivedData:withDataSource:]): Update the URL for the
+	case where we've already been redirected before we receive any data.
+
+2002-06-26  Darin Adler  <darin at apple.com>
+
 	- fixed 2971532 -- crash with null KHTMLView at gramicci.com
 
         * WebView.subproj/IFHTMLView.mm:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 763f593..a8f701d 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,14 @@
 2002-06-26  Darin Adler  <darin at apple.com>
 
+	- fixed 2969280 -- if trailing / not specified for site, relative URLs are
+	incorrectly expanded
+
+        * WebCoreSupport.subproj/IFWebCoreBridge.mm:
+        (-[IFWebCoreBridge receivedData:withDataSource:]): Update the URL for the
+	case where we've already been redirected before we receive any data.
+
+2002-06-26  Darin Adler  <darin at apple.com>
+
 	- fixed 2971532 -- crash with null KHTMLView at gramicci.com
 
         * WebView.subproj/IFHTMLView.mm:
diff --git a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
index a2e34c0..7063b93 100644
--- a/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
+++ b/WebKit/WebCoreSupport.subproj/IFWebCoreBridge.mm
@@ -120,6 +120,9 @@
     if (dataSource == nil) {
         [self setDataSource: withDataSource];
         [self openURL:[dataSource inputURL]];
+        if ([dataSource redirectedURL]) {
+            [self setURL:[dataSource redirectedURL]];
+        }
     } else {
         WEBKIT_ASSERT(dataSource == withDataSource);
     }
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index a2e34c0..7063b93 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -120,6 +120,9 @@
     if (dataSource == nil) {
         [self setDataSource: withDataSource];
         [self openURL:[dataSource inputURL]];
+        if ([dataSource redirectedURL]) {
+            [self setURL:[dataSource redirectedURL]];
+        }
     } else {
         WEBKIT_ASSERT(dataSource == withDataSource);
     }

-- 
WebKit Debian packaging