[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 c05c85fdcd70da2dbb410e70b4b7a2fba1de4183
Author: sullivan <sullivan at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jun 26 20:44:34 2002 +0000

    	- fixed 2971024 -- wrong item is bookmarked
    
    	-[IFWebDataSource redirectedURL] was returning the URL of a
    	sub-page resource.
    
            * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
            (-[IFResourceURLHandleClient IFURLHandle:didRedirectToURL:]):
    	Removed evil call to _setFinalURL here. It had no right to live.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@1443 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 702a5e8..6e361a1 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,14 @@
+2002-06-26  John Sullivan  <sullivan at apple.com>
+
+	- fixed 2971024 -- wrong item is bookmarked
+
+	-[IFWebDataSource redirectedURL] was returning the URL of a
+	sub-page resource.
+
+        * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+        (-[IFResourceURLHandleClient IFURLHandle:didRedirectToURL:]):
+	Removed evil call to _setFinalURL here. It had no right to live.
+
 2002-06-26  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRendererFactory.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 702a5e8..6e361a1 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,3 +1,14 @@
+2002-06-26  John Sullivan  <sullivan at apple.com>
+
+	- fixed 2971024 -- wrong item is bookmarked
+
+	-[IFWebDataSource redirectedURL] was returning the URL of a
+	sub-page resource.
+
+        * WebCoreSupport.subproj/IFResourceURLHandleClient.m:
+        (-[IFResourceURLHandleClient IFURLHandle:didRedirectToURL:]):
+	Removed evil call to _setFinalURL here. It had no right to live.
+
 2002-06-26  Darin Adler  <darin at apple.com>
 
         * WebCoreSupport.subproj/IFImageRendererFactory.m:
diff --git a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
index 9c9a955..e6146c0 100644
--- a/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
+++ b/WebKit/WebCoreSupport.subproj/IFResourceURLHandleClient.m
@@ -179,7 +179,6 @@
     WEBKIT_ASSERT(currentURL != nil);
     WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
 
-    [dataSource _setFinalURL:URL];
     [[dataSource _bridge] setURL:URL];
 
     // FIXME: We do want to tell the client about redirects.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 9c9a955..e6146c0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -179,7 +179,6 @@
     WEBKIT_ASSERT(currentURL != nil);
     WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
 
-    [dataSource _setFinalURL:URL];
     [[dataSource _bridge] setURL:URL];
 
     // FIXME: We do want to tell the client about redirects.
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 9c9a955..e6146c0 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -179,7 +179,6 @@
     WEBKIT_ASSERT(currentURL != nil);
     WEBKIT_ASSERT([URL isEqual:[handle redirectedURL]]);
 
-    [dataSource _setFinalURL:URL];
     [[dataSource _bridge] setURL:URL];
 
     // FIXME: We do want to tell the client about redirects.

-- 
WebKit Debian packaging