[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
kocienda
kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 07:31:17 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 13bd51d7a374bbc64db11146a1e910c0a08074d5
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Mar 24 22:37:48 2003 +0000
WebFoundation:
Reviewed by NOBODY (OOPS!).
Moved closer to target API for NSURLRequest. Merged in
final names for immutable and mutable versions of this
class and its HTTP category. The next step will be to
actually make the split between immutable/mutable
variants of NSURLRequest.
This involved some non-complicated changes in the
internals of NSURLRequest.
Note that NSURLRequestPrivate.h has taken on some methods
that used to be API, but were removed from the public
proposal. These methods are now available as SPI.
* CacheLoader.subproj/NSURLRequest.h:
* CacheLoader.subproj/NSURLRequest.m:
(+[NSURLRequest requestWithURL:cachePolicy:timeoutInterval:]):
(+[NSURLRequest requestWithURL:]):
(-[NSURLRequest initWithURL:cachePolicy:timeoutInterval:]):
(-[NSURLRequest initWithURL:]):
(-[NSURLRequest init]):
(-[NSURLRequest URL]):
(-[NSURLRequest timeoutInterval]):
(-[NSURLRequest setURL:]):
(-[NSURLRequest setCachePolicy:]):
(-[NSURLRequest setTimeoutInterval:]):
(NSHTTPURLRequestInit):
(-[NSURLRequest _parametersForReading]):
(-[NSURLRequest _parametersForWriting]):
(-[NSURLRequest HTTPMethod]):
(-[NSURLRequest HTTPAllHeaderFields]):
(-[NSURLRequest HTTPValueForHeaderField:]):
(-[NSURLRequest HTTPBody]):
(-[NSURLRequest HTTPAllowSSLCertificatesWithUnknownRoots]):
(-[NSURLRequest HTTPContentType]):
(-[NSURLRequest HTTPCookiePolicyBaseURL]):
(-[NSURLRequest HTTPExtraCookies]):
(-[NSURLRequest HTTPPageNotFoundCacheLifetime]):
(-[NSURLRequest HTTPReferrer]):
(-[NSURLRequest HTTPUserAgent]):
(-[NSURLRequest HTTPSetMethod:]):
(-[NSURLRequest HTTPSetAllHeaderFields:]):
(-[NSURLRequest HTTPSetValue:forHeaderField:]):
(-[NSURLRequest HTTPAddValue:forHeaderField:]):
(-[NSURLRequest HTTPSetBody:]):
(-[NSURLRequest HTTPSetAllowSSLCertificatesWithUnknownRoots:]):
(-[NSURLRequest HTTPSetContentType:]):
(-[NSURLRequest HTTPSetCookiePolicyBaseURL:]):
(-[NSURLRequest HTTPSetExtraCookies:]):
(-[NSURLRequest HTTPSetPageNotFoundCacheLifetime:]):
(-[NSURLRequest HTTPSetReferrer:]):
(-[NSURLRequest HTTPSetUserAgent:]):
(-[NSHTTPURLRequestRequestParameters copyWithZone:]):
(-[NSHTTPURLRequestRequestParameters dealloc]):
(-[NSHTTPURLRequestRequestParameters hash]):
(-[NSHTTPURLRequestRequestParameters isEqual:]):
(-[NSHTTPURLRequestRequestParameters description]):
* CacheLoader.subproj/NSURLRequestPrivate.h:
* CacheLoader.subproj/WebCacheManager.m:
* CacheLoader.subproj/WebResource.m:
(-[WebResource _cacheKey]):
* CacheLoader.subproj/WebResponse.h:
* CacheLoader.subproj/WebResponse.m:
(-[WebResponse contentType]):
(-[WebResponse setContentType:]):
* English.lproj/StringsNotToBeLocalized.txt:
* Misc.subproj/WebFoundation.h:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
(-[WebCFNetworkHTTPProtocol setCertificatePolicyOnStream]):
(-[WebCFNetworkHTTPProtocol addAcceptFieldsToHeader]):
(-[WebCFNetworkHTTPProtocol addCookieFieldToHeader]):
(-[WebCFNetworkHTTPProtocol addReferrerFieldToHeader]):
(-[WebCFNetworkHTTPProtocol addUserAgentFieldToHeader]):
(-[WebCFNetworkHTTPProtocol addExtraFieldsToHeader]):
(-[WebCFNetworkHTTPProtocol addMessageBodyToRequest]):
(-[WebCFNetworkHTTPProtocol buildHTTPRequest]):
(-[WebCFNetworkHTTPProtocol setResponseHeaderUsingHTTPResponse:andCall:context:]):
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol shouldAttemptOriginLoad]):
(-[WebHTTPProtocol canStoreCacheObject:]):
(-[WebHTTPProtocol stateForCacheObject:]):
* ProtocolHandlers.subproj/WebHTTPRequest.h: Removed.
* ProtocolHandlers.subproj/WebHTTPRequest.m: Removed.
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.h:
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol _canUsePersistentConnectionForRequest]):
(-[WebSimpleHTTPProtocol _addRequestMessageBody]):
(-[WebSimpleHTTPProtocol buildHTTPRequest]):
(-[WebSimpleHTTPProtocol _parseHeaderFromData:]):
* WebFoundation.pbproj/project.pbxproj:
WebKit:
Reviewed by NOBODY (OOPS!).
Moved closer to target API for NSURLRequest. Merged in
final names for immutable and mutable versions of this
class and its HTTP category. The next step will be to
actually make the split between immutable/mutable
variants of NSURLRequest.
In WebKit, this amounts to name changes only.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading]):
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
(-[WebBridge incomingReferrer]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
* WebView.subproj/WebDataSourcePrivate.m:
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
* WebView.subproj/WebFrame.m:
(-[WebFrame reload]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _createItem]):
(-[WebFrame _loadItem:fromItem:withLoadType:]):
(-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
(-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
(-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient resource:willSendRequest:]):
WebBrowser:
Reviewed by NOBODY (OOPS!).
Moved closer to target API for NSURLRequest. Merged in
final names for immutable and mutable versions of this
class and its HTTP category. The next step will be to
actually make the split between immutable/mutable
variants of NSURLRequest.
In WebBrowser, this amounts to name changes only.
* BrowserDocument.m:
* BrowserDocumentController.m:
* BrowserWebController.m:
(-[BrowserWebController decidePolicyForAction:andRequest:inFrame:newFrameName:decisionListener:]):
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
* English.lproj/Localizable.strings:
* LocationChangeHandler.m:
(-[LocationChangeHandler unknownRootSheetDidEnd:returnCode:contextInfo:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3907 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 65ee284..d2f56ed 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,40 @@
+2003-03-24 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by NOBODY (OOPS!).
+
+ Moved closer to target API for NSURLRequest. Merged in
+ final names for immutable and mutable versions of this
+ class and its HTTP category. The next step will be to
+ actually make the split between immutable/mutable
+ variants of NSURLRequest.
+
+ In WebKit, this amounts to name changes only.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading]):
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ (-[WebBridge incomingReferrer]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ * WebView.subproj/WebDataSourcePrivate.m:
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
+ * WebView.subproj/WebFrame.m:
+ (-[WebFrame reload]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _createItem]):
+ (-[WebFrame _loadItem:fromItem:withLoadType:]):
+ (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+ (-[WebFrame _loadURL:referrer:loadType:target:triggeringEvent:form:formValues:]):
+ (-[WebFrame _postWithURL:referrer:target:data:contentType:triggeringEvent:form:formValues:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient resource:willSendRequest:]):
+
2003-03-22 Darin Adler <darin at apple.com>
Reviewed by John.
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 56eaad4..7156e08 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -14,7 +14,8 @@
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
+
#define WebIconLoaderWeeksWorthOfSeconds (60 * 60 * 24 * 7)
@@ -85,7 +86,7 @@
}
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:_private->URL];
- [request setPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
+ [request HTTPSetPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
_private->handle = [[WebResource alloc] initWithRequest:request];
[_private->handle loadWithDelegate:self];
[request release];
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index 20bfecc..a8fee4b 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -20,7 +20,7 @@
#import <WebKit/WebWindowOperationsDelegate.h>
#import <WebFoundation/WebAssertions.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebNSDataExtras.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -1164,7 +1164,7 @@ typedef struct {
}
NSURLRequest *request = [self requestWithURLCString:URLCString];
- [request setRequestMethod:@"POST"];
+ [request HTTPSetMethod:@"POST"];
if (allowHeaders) {
if ([postData _web_startsWithBlankLine]) {
@@ -1176,7 +1176,7 @@ typedef struct {
NSData *headerData = [postData subdataWithRange:NSMakeRange(0, location)];
NSDictionary *header = [headerData _web_parseRFC822HeaderFields];
if ([header count] > 0) {
- [request setHeader:header];
+ [request HTTPSetAllHeaderFields:header];
}
// Everything after the blank line is the actual content of the POST.
postData = [postData subdataWithRange:NSMakeRange(location, [postData length] - location)];
@@ -1187,7 +1187,7 @@ typedef struct {
}
}
- [request setRequestData:postData];
+ [request HTTPSetBody:postData];
return [self loadRequest:request inTarget:target withNotifyData:notifyData];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 48a2b5d..5997a18 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -42,7 +42,9 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
+#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebNSDictionaryExtras.h>
#import <WebFoundation/WebNSURLExtras.h>
@@ -108,7 +110,7 @@
if (URL != nil && [URL length] > 0) {
request = [NSURLRequest requestWithURL:[NSURL _web_URLWithString:URL]];
- [request setReferrer:[self referrer]];
+ [request HTTPSetReferrer:[self referrer]];
}
WebView *currentController = [frame webView];
@@ -482,7 +484,7 @@
- (NSString *)incomingReferrer
{
- return [[[self dataSource] request] referrer];
+ return [[[self dataSource] request] HTTPReferrer];
}
- (NSView <WebPlugin> *)pluginViewWithPackage:(WebPluginPackage *)pluginPackage
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index 18c8c3e..9a7b391 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -14,7 +14,8 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceDelegate.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
+
#import <WebFoundation/WebResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -47,11 +48,11 @@
NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
- [newRequest setReferrer:referrer];
+ [newRequest HTTPSetReferrer:referrer];
WebView *_controller = [source _controller];
- [newRequest setCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
- [newRequest setUserAgent:[_controller userAgentForURL:URL]];
+ [newRequest HTTPSetCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
+ [newRequest HTTPSetUserAgent:[_controller userAgentForURL:URL]];
BOOL succeeded = [client loadWithRequest:newRequest];
[newRequest release];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
index 18c8c3e..9a7b391 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -14,7 +14,8 @@
#import <WebFoundation/WebError.h>
#import <WebFoundation/WebResourceDelegate.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebHTTPRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
+
#import <WebFoundation/WebResponse.h>
#import <WebCore/WebCoreResourceLoader.h>
@@ -47,11 +48,11 @@
NSURLRequest *newRequest = [[NSURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
- [newRequest setReferrer:referrer];
+ [newRequest HTTPSetReferrer:referrer];
WebView *_controller = [source _controller];
- [newRequest setCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
- [newRequest setUserAgent:[_controller userAgentForURL:URL]];
+ [newRequest HTTPSetCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
+ [newRequest HTTPSetUserAgent:[_controller userAgentForURL:URL]];
BOOL succeeded = [client loadWithRequest:newRequest];
[newRequest release];
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index 29b8b10..d6bfc29 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -7,9 +7,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -134,7 +135,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [newRequest setUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ [newRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
diff --git a/WebKit/WebView.subproj/WebDataSourcePrivate.m b/WebKit/WebView.subproj/WebDataSourcePrivate.m
index 695f207..2698abb 100644
--- a/WebKit/WebView.subproj/WebDataSourcePrivate.m
+++ b/WebKit/WebView.subproj/WebDataSourcePrivate.m
@@ -36,7 +36,7 @@
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
#import <WebFoundation/WebResponse.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
@implementation WebDataSourcePrivate
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 1c4e1e9..2ccbea1 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -15,10 +15,11 @@
#import <WebKit/WebViewPrivate.h>
#import <WebKit/WebWindowOperationsDelegate.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebLocalizableStrings.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
@implementation WebDefaultContextMenuDelegate
@@ -145,7 +146,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
NSURLRequest *request = [NSURLRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
if (referrer) {
- [request setReferrer:referrer];
+ [request HTTPSetReferrer:referrer];
}
[controller _openNewWindowWithRequest:request];
diff --git a/WebKit/WebView.subproj/WebFrame.m b/WebKit/WebView.subproj/WebFrame.m
index 6c4a18e..c03945b 100644
--- a/WebKit/WebView.subproj/WebFrame.m
+++ b/WebKit/WebView.subproj/WebFrame.m
@@ -23,7 +23,7 @@
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/NSURLRequest.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebNSStringExtras.h>
@implementation WebFrame
@@ -141,7 +141,7 @@
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
// If we're about to rePOST, set up action so the app can warn the user
- if ([[request requestMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ if ([[request HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
NSDictionary *action = [self _actionInformationForNavigationType:WebNavigationTypeFormResubmitted event:nil originalURL:[request URL]];
[newDataSource _setTriggeringAction:action];
}
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 69ded36..37b493b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -32,8 +32,9 @@
#import <WebFoundation/WebNSStringExtras.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebResponse.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebSynchronousResult.h>
#import <objc/objc-runtime.h>
@@ -277,10 +278,10 @@ Repeat load of the same URL (by any other means of navigation other than the rel
[bfItem setOriginalURLString:[[[dataSrc _originalRequest] URL] absoluteString]];
// save form state if this is a POST
- if ([[request requestMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
- [bfItem setFormData:[request requestData]];
- [bfItem setFormContentType:[request contentType]];
- [bfItem setFormReferrer:[request referrer]];
+ if ([[request HTTPMethod] _web_isCaseInsensitiveEqualToString:@"POST"]) {
+ [bfItem setFormData:[request HTTPBody]];
+ [bfItem setFormContentType:[request HTTPContentType]];
+ [bfItem setFormReferrer:[request HTTPReferrer]];
}
// Set the item for which we will save document state
@@ -1090,10 +1091,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
// If this was a repost that failed the page cache, we might try to repost the form.
NSDictionary *action;
if (formData) {
- [request setRequestMethod:@"POST"];
- [request setRequestData:formData];
- [request setContentType:[item formContentType]];
- [request setReferrer:[item formReferrer]];
+ [request HTTPSetMethod:@"POST"];
+ [request HTTPSetBody:formData];
+ [request HTTPSetContentType:[item formContentType]];
+ [request HTTPSetReferrer:[item formReferrer]];
// Slight hack to test if the WF cache contains the page we're going to. We want
// to know this before talking to the policy delegate, since it affects whether we
@@ -1482,14 +1483,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_addExtraFieldsToRequest:(NSURLRequest *)request alwaysFromRequest: (BOOL)f
{
- [request setUserAgent:[[self webView] userAgentForURL:[request URL]]];
+ [request HTTPSetUserAgent:[[self webView] userAgentForURL:[request URL]]];
// Don't set the cookie policy URL if it's already been set.
- if ([request cookiePolicyBaseURL] == nil){
+ if ([request HTTPCookiePolicyBaseURL] == nil){
if (self == [[self webView] mainFrame] || f) {
- [request setCookiePolicyBaseURL:[request URL]];
+ [request HTTPSetCookiePolicyBaseURL:[request URL]];
} else {
- [request setCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
+ [request HTTPSetCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
}
}
}
@@ -1524,7 +1525,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
BOOL isFormSubmission = (values != nil);
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
- [request setReferrer:referrer];
+ [request HTTPSetReferrer:referrer];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
@@ -1653,10 +1654,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
NSURLRequest *request = [[NSURLRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: YES];
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
- [request setRequestMethod:@"POST"];
- [request setRequestData:data];
- [request setContentType:contentType];
- [request setReferrer:referrer];
+ [request HTTPSetMethod:@"POST"];
+ [request HTTPSetBody:data];
+ [request HTTPSetContentType:contentType];
+ [request HTTPSetReferrer:referrer];
NSDictionary *action = [self _actionInformationForLoadType:WebFrameLoadTypeStandard isFormSubmission:YES event:event originalURL:URL];
WebFormState *formState = nil;
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index 29b8b10..d6bfc29 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -7,9 +7,10 @@
#import <WebFoundation/WebAssertions.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebResponse.h>
#import <WebKit/WebDataSourcePrivate.h>
@@ -134,7 +135,7 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [newRequest setUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ [newRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 87b337f..aca3ba5 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -7,11 +7,12 @@
#import <WebFoundation/WebCookieConstants.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
@@ -114,7 +115,7 @@
// 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];
+ [newRequest HTTPSetCookiePolicyBaseURL:URL];
}
// note super will make a copy for us, so reassigning newRequest is important
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 87b337f..aca3ba5 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -7,11 +7,12 @@
#import <WebFoundation/WebCookieConstants.h>
#import <WebFoundation/WebError.h>
-#import <WebFoundation/WebHTTPRequest.h>
+
#import <WebFoundation/WebFileTypeMappings.h>
#import <WebFoundation/WebNSURLExtras.h>
#import <WebFoundation/WebResource.h>
#import <WebFoundation/NSURLRequest.h>
+#import <WebFoundation/NSURLRequestPrivate.h>
#import <WebFoundation/WebResponse.h>
#import <WebFoundation/WebMutableResponse.h>
@@ -114,7 +115,7 @@
// 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];
+ [newRequest HTTPSetCookiePolicyBaseURL:URL];
}
// note super will make a copy for us, so reassigning newRequest is important
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list