Commit f146ac5e authored by rjw's avatar rjw
Browse files

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
parent a8df9fbf
2003-01-01 Richard Williamson <rjw@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@apple.com>
Don't attempt to restore page from page cache if the cache
......
......@@ -1375,10 +1375,14 @@ -(void)_continueFragmentScrollAfterNavigationPolicy:(BOOL)shouldContinue request
- (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]];
}
}
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment