[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 5a508ac7fe60084a46a7f929a68c34a68274cdce
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Oct 17 16:48:15 2002 +0000

    	- fixed 3062613 -- too many redirects at nytimes.com and apple
    
    	Our cookie policy was rejecting the cookies from nytimes.com -- the policy base
    	URL was still the news.com URL from before the redirect.
    
            * WebView.subproj/WebMainResourceClient.m:
            (-[WebMainResourceClient handle:willSendRequest:]):
    	Update the cookie policy URL when a redirect changes the data source's URL.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2354 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index f5a69c6..74daaa5 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,16 @@
 2002-10-17  Darin Adler  <darin at apple.com>
 
+	- fixed 3062613 -- too many redirects at nytimes.com and apple
+
+	Our cookie policy was rejecting the cookies from nytimes.com -- the policy base
+	URL was still the news.com URL from before the redirect.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+	Update the cookie policy URL when a redirect changes the data source's URL.
+
+2002-10-17  Darin Adler  <darin at apple.com>
+
 	- fixed 3077910 -- REGRESSION: download window open at startup time -> no scrollbars
 
         * WebView.subproj/WebDynamicScrollBarsView.m:
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index f5a69c6..74daaa5 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,5 +1,16 @@
 2002-10-17  Darin Adler  <darin at apple.com>
 
+	- fixed 3062613 -- too many redirects at nytimes.com and apple
+
+	Our cookie policy was rejecting the cookies from nytimes.com -- the policy base
+	URL was still the news.com URL from before the redirect.
+
+        * WebView.subproj/WebMainResourceClient.m:
+        (-[WebMainResourceClient handle:willSendRequest:]):
+	Update the cookie policy URL when a redirect changes the data source's URL.
+
+2002-10-17  Darin Adler  <darin at apple.com>
+
 	- fixed 3077910 -- REGRESSION: download window open at startup time -> no scrollbars
 
         * WebView.subproj/WebDynamicScrollBarsView.m:
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 641af8c..b4e5a81 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -194,8 +194,11 @@
 
     LOG(Redirect, "URL = %@", URL);
 
-    // FIXME: need to update main document URL here, or cookies set
-    // via redirects might not work in main document mode
+    // Update cookie policy base URL as URL changes, except for subframes, which use the
+    // URL of the main frame which doesn't change when we redirect.
+    if ([dataSource webFrame] == [[dataSource controller] mainFrame]) {
+        [newRequest setCookiePolicyBaseURL:URL];
+    }
 
     WebResourceRequest *copy = [newRequest copy];
 
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 641af8c..b4e5a81 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -194,8 +194,11 @@
 
     LOG(Redirect, "URL = %@", URL);
 
-    // FIXME: need to update main document URL here, or cookies set
-    // via redirects might not work in main document mode
+    // Update cookie policy base URL as URL changes, except for subframes, which use the
+    // URL of the main frame which doesn't change when we redirect.
+    if ([dataSource webFrame] == [[dataSource controller] mainFrame]) {
+        [newRequest setCookiePolicyBaseURL:URL];
+    }
 
     WebResourceRequest *copy = [newRequest copy];
 

-- 
WebKit Debian packaging