[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:39:42 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit 3a6cea809decaf9f36d307ca145ae919fe17554b
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Thu May 1 00:59:28 2003 +0000
WebFoundation:
Reviewed by Maciej
Tweaked some HTTP-specific NSURLRequest method names as specified
in the API errata list.
* CacheLoader.subproj/NSURLRequest.h:
* CacheLoader.subproj/NSURLRequest.m:
(-[NSURLRequest allHTTPHeaderFields]):
(-[NSURLRequest valueForHTTPHeaderField:]):
(-[NSURLRequest allowsHTTPSCertificatesWithUnknownRoots]):
(-[NSURLRequest HTTPContentType]):
(-[NSURLRequest HTTPReferrer]):
(-[NSURLRequest HTTPUserAgent]):
(-[NSMutableURLRequest setHTTPMethod:]):
(-[NSMutableURLRequest setAllHTTPHeaderFields:]):
(-[NSMutableURLRequest setValue:forHTTPHeaderField:]):
(-[NSMutableURLRequest addValue:forHTTPHeaderField:]):
(-[NSMutableURLRequest setHTTPBody:]):
(-[NSMutableURLRequest setAllowsHTTPSCertificatesWithUnknownRoots:]):
(-[NSMutableURLRequest setHTTPContentType:]):
(-[NSMutableURLRequest setHTTPCookiePolicyBaseURL:]):
(-[NSMutableURLRequest setHTTPExtraCookies:]):
(-[NSMutableURLRequest setHTTPPageNotFoundCacheLifetime:]):
(-[NSMutableURLRequest setHTTPReferrer:]):
(-[NSMutableURLRequest setHTTPUserAgent:]):
* CacheLoader.subproj/NSURLRequestPrivate.h:
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocol.m:
(-[WebCFNetworkHTTPProtocol setCertificatePolicyOnStream]):
(-[WebCFNetworkHTTPProtocol addAcceptFieldsToHeader]):
(-[WebCFNetworkHTTPProtocol addExtraFieldsToHeader]):
* ProtocolHandlers.subproj/WebHTTPProtocol.m:
(-[WebHTTPProtocol _cachedResponsePassesValidityChecks]):
(-[WebHTTPProtocol _shouldAttemptOriginLoad]):
(-[WebHTTPProtocol retryWithRedirectedURLAndResultCode:]):
* ProtocolHandlers.subproj/WebSimpleHTTPProtocol.m:
(-[WebSimpleHTTPProtocol buildHTTPRequest]):
WebKit:
Reviewed by Maciej
Tweaked some HTTP-specific NSURLRequest method names as specified
in the API errata list.
* Plugins.subproj/WebBaseNetscapePluginView.m:
(-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
(-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
* WebCoreSupport.subproj/WebSubresourceClient.m:
(+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate connection:willSendRequest:redirectResponse:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultUIDelegate openNewWindowWithURL:]):
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _loadItem: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 connection:willSendRequest:redirectResponse:]):
WebBrowser:
Reviewed by Maciej
Tweaked some HTTP-specific NSURLRequest method names as specified
in the API errata list.
* BugReportController.m:
(-[BugReportController sendBugReportToAppleWithScreenShot:source:]):
* LocationChangeHandler.m:
(-[LocationChangeHandler unknownRootSheetDidEnd:returnCode:contextInfo:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@4234 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 94a5f66..cf7307c 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,29 @@
+2003-04-30 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Maciej
+
+ Tweaked some HTTP-specific NSURLRequest method names as specified
+ in the API errata list.
+
+ * Plugins.subproj/WebBaseNetscapePluginView.m:
+ (-[WebBaseNetscapePluginView loadRequest:inTarget:withNotifyData:]):
+ (-[WebBaseNetscapePluginView _postURLNotify:target:len:buf:file:notifyData:allowHeaders:]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ * WebCoreSupport.subproj/WebSubresourceClient.m:
+ (+[WebSubresourceClient startLoadingResource:withURL:referrer:forDataSource:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate connection:willSendRequest:redirectResponse:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultUIDelegate openNewWindowWithURL:]):
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _loadItem: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 connection:willSendRequest:redirectResponse:]):
+
2003-04-30 Maciej Stachowiak <mjs at apple.com>
Reviewed by Ken.
diff --git a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
index eb8c99b..6745544 100644
--- a/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
+++ b/WebKit/Plugins.subproj/WebBaseNetscapePluginView.m
@@ -1194,7 +1194,7 @@ typedef struct {
// Find the frame given the target string.
NSString *target = (NSString *)CFStringCreateWithCString(kCFAllocatorDefault, cTarget, kCFStringEncodingWindowsLatin1);
- [request HTTPSetReferrer:[[[[[self webFrame] dataSource] request] URL] absoluteString]];
+ [request setHTTPReferrer:[[[[[self webFrame] dataSource] request] URL] absoluteString]];
// Make a request, but don't do it right away because it could make the plugin view go away.
WebPluginRequest *pluginRequest = [[WebPluginRequest alloc]
initWithRequest:request frameName:target notifyData:notifyData];
@@ -1263,7 +1263,7 @@ typedef struct {
}
NSMutableURLRequest *request = [self requestWithURLCString:URLCString];
- [request HTTPSetMethod:@"POST"];
+ [request setHTTPMethod:@"POST"];
if (allowHeaders) {
if ([postData _web_startsWithBlankLine]) {
@@ -1287,7 +1287,7 @@ typedef struct {
[header removeObjectForKey:@"Content-Length"];
if ([header count] > 0) {
- [request HTTPSetAllHeaderFields:header];
+ [request setAllHTTPHeaderFields:header];
}
// Everything after the blank line is the actual content of the POST.
postData = [postData subdataWithRange:NSMakeRange(location, dataLength)];
@@ -1299,7 +1299,7 @@ typedef struct {
}
}
- [request HTTPSetBody:postData];
+ [request setHTTPBody:postData];
return [self loadRequest:request inTarget:target withNotifyData:notifyData];
}
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index ed3d347..af74299 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -107,7 +107,7 @@
if (URL != nil && [URL length] > 0) {
request = [NSMutableURLRequest requestWithURL:[NSURL _web_URLWithString:URL]];
- [request HTTPSetReferrer:[self referrer]];
+ [request setHTTPReferrer:[self referrer]];
}
WebView *currentController = [frame webView];
diff --git a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
index d9d0619..7e32398 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceClient.m
@@ -51,11 +51,11 @@
NSMutableURLRequest *newRequest = [[NSMutableURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
- [newRequest HTTPSetReferrer:referrer];
+ [newRequest setHTTPReferrer:referrer];
WebView *_controller = [source _controller];
- [newRequest HTTPSetCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
- [newRequest HTTPSetUserAgent:[_controller userAgentForURL:URL]];
+ [newRequest setHTTPCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
+ [newRequest setHTTPUserAgent:[_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 d9d0619..7e32398 100644
--- a/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
+++ b/WebKit/WebCoreSupport.subproj/WebSubresourceLoader.m
@@ -51,11 +51,11 @@
NSMutableURLRequest *newRequest = [[NSMutableURLRequest alloc] initWithURL:URL];
[newRequest setCachePolicy:[[source request] cachePolicy]];
- [newRequest HTTPSetReferrer:referrer];
+ [newRequest setHTTPReferrer:referrer];
WebView *_controller = [source _controller];
- [newRequest HTTPSetCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
- [newRequest HTTPSetUserAgent:[_controller userAgentForURL:URL]];
+ [newRequest setHTTPCookiePolicyBaseURL:[[[[_controller mainFrame] dataSource] request] URL]];
+ [newRequest setHTTPUserAgent:[_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 4919824..80b36e8 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -133,7 +133,7 @@
NSURLRequest *clientRequest, *updatedRequest;
BOOL haveDataSchemeRequest = NO;
- [mutableRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ [mutableRequest setHTTPUserAgent:[controller userAgentForURL:[newRequest URL]]];
newRequest = [mutableRequest autorelease];
clientRequest = [newRequest _webDataRequestExternalRequest];
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index ee6d36c..1cf3494 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -126,7 +126,7 @@
NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
if (referrer) {
- [request HTTPSetReferrer:referrer];
+ [request setHTTPReferrer:referrer];
}
[controller _openNewWindowWithRequest:request];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 5e034ca..477cb5b 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1152,10 +1152,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 HTTPSetMethod:@"POST"];
- [request HTTPSetBody:formData];
- [request HTTPSetContentType:[item formContentType]];
- [request HTTPSetReferrer:[item formReferrer]];
+ [request setHTTPMethod:@"POST"];
+ [request setHTTPBody:formData];
+ [request setHTTPContentType:[item formContentType]];
+ [request setHTTPReferrer:[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
@@ -1546,14 +1546,14 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f
{
- [request HTTPSetUserAgent:[[self webView] userAgentForURL:[request URL]]];
+ [request setHTTPUserAgent:[[self webView] userAgentForURL:[request URL]]];
// Don't set the cookie policy URL if it's already been set.
if ([request HTTPCookiePolicyBaseURL] == nil){
if (self == [[self webView] mainFrame] || f) {
- [request HTTPSetCookiePolicyBaseURL:[request URL]];
+ [request setHTTPCookiePolicyBaseURL:[request URL]];
} else {
- [request HTTPSetCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
+ [request setHTTPCookiePolicyBaseURL:[[[[self webView] mainFrame] dataSource] _URL]];
}
}
}
@@ -1588,7 +1588,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
BOOL isFormSubmission = (values != nil);
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
- [request HTTPSetReferrer:referrer];
+ [request setHTTPReferrer:referrer];
[self _addExtraFieldsToRequest:request alwaysFromRequest: (event != nil || isFormSubmission)];
if (loadType == WebFrameLoadTypeReload) {
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
@@ -1718,10 +1718,10 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:URL];
[self _addExtraFieldsToRequest:request alwaysFromRequest: YES];
[request setCachePolicy:NSURLRequestReloadIgnoringCacheData];
- [request HTTPSetMethod:@"POST"];
- [request HTTPSetBody:data];
- [request HTTPSetContentType:contentType];
- [request HTTPSetReferrer:referrer];
+ [request setHTTPMethod:@"POST"];
+ [request setHTTPBody:data];
+ [request setHTTPContentType:contentType];
+ [request setHTTPReferrer: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 4919824..80b36e8 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -133,7 +133,7 @@
NSURLRequest *clientRequest, *updatedRequest;
BOOL haveDataSchemeRequest = NO;
- [mutableRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ [mutableRequest setHTTPUserAgent:[controller userAgentForURL:[newRequest URL]]];
newRequest = [mutableRequest autorelease];
clientRequest = [newRequest _webDataRequestExternalRequest];
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 6470fc5..5eb3bf9 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -117,7 +117,7 @@
// URL of the main frame which doesn't change when we redirect.
if ([dataSource webFrame] == [[dataSource _controller] mainFrame]) {
mutableRequest = [newRequest mutableCopy];
- [mutableRequest HTTPSetCookiePolicyBaseURL:URL];
+ [mutableRequest setHTTPCookiePolicyBaseURL:URL];
}
// If we're fielding a redirect in response to a POST, force a load from origin, since
diff --git a/WebKit/WebView.subproj/WebMainResourceLoader.m b/WebKit/WebView.subproj/WebMainResourceLoader.m
index 6470fc5..5eb3bf9 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -117,7 +117,7 @@
// URL of the main frame which doesn't change when we redirect.
if ([dataSource webFrame] == [[dataSource _controller] mainFrame]) {
mutableRequest = [newRequest mutableCopy];
- [mutableRequest HTTPSetCookiePolicyBaseURL:URL];
+ [mutableRequest setHTTPCookiePolicyBaseURL:URL];
}
// If we're fielding a redirect in response to a POST, force a load from origin, since
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list