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

[rjw]

The following commit has been merged in the debian/unstable branch:
commit f146ac5ebfda9f423e21f04712825742c0117ef6
Author: rjw <rjw at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Jan 1 22:35:53 2003 +0000

            Don't reset the cookie policy URL if it has already been set.  Fixes to 3109590.
    
            Reviewed by Maciej.
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 3cbe80d..40aeb0e 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,5 +1,14 @@
 2003-01-01  Richard Williamson   <rjw at apple.com>
 
+        Don't reset the cookie policy URL if it has already been set.  Fixes to 3109590.
+        
+        Reviewed by Maciej.
+
+        * WebView.subproj/WebFramePrivate.m:
+        (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+
+2003-01-01  Richard Williamson   <rjw at apple.com>
+
         Don't attempt to restore page from page cache if the cache
         doesn't contain valid page state.  This may happen after a
         redirect.  Fixes 3137430.
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index ad32bdc..d82e3f0 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1375,10 +1375,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
 - (void)_addExtraFieldsToRequest:(WebResourceRequest *)request alwaysFromRequest: (BOOL)f
 {
     [request setUserAgent:[[self controller] userAgentForURL:[request URL]]];
-    if (self == [[self controller] mainFrame] || f) {
-	[request setCookiePolicyBaseURL:[request URL]];
-    } else {
-	[request setCookiePolicyBaseURL:[[[[self controller] mainFrame] dataSource] URL]];
+    
+    // Don't set the cookie policy URL if it's already been set.
+    if ([request cookiePolicyBaseURL] == nil){
+        if (self == [[self controller] mainFrame] || f) {
+            [request setCookiePolicyBaseURL:[request URL]];
+        } else {
+            [request setCookiePolicyBaseURL:[[[[self controller] mainFrame] dataSource] URL]];
+        }
     }
 }
 

-- 
WebKit Debian packaging