[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:37 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit b1ab9ccc8587bee50bc161ac99699fe41cca1a63
Author: kocienda <kocienda at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Mar 26 16:28:53 2003 +0000
WebFoundation:
Reviewed by Maciej
Finished conversion to NSMutableURLRequest. HTTP-specific
mutator methods are now properly placed on an HTTP
category of NSMutableURLRequest. All client code has
been updated to use NSMutableURLRequest where appropriate.
* CacheLoader.subproj/NSURLRequest.m:
(-[NSMutableURLRequest _parametersForWriting]):
* CacheLoader.subproj/NSURLRequestPrivate.h:
WebKit:
Reviewed by Maciej
Finished conversion to NSMutableURLRequest. HTTP-specific
mutator methods are now properly placed on an HTTP
category of NSMutableURLRequest. All client code has
been updated to use NSMutableURLRequest where appropriate.
* Misc.subproj/WebIconLoader.m:
(-[WebIconLoader startLoading]):
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge createWindowWithURL:frameName:]):
* WebView.subproj/WebBaseResourceHandleDelegate.m:
(-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
* WebView.subproj/WebDefaultContextMenuDelegate.m:
(-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
* WebView.subproj/WebFramePrivate.h:
* WebView.subproj/WebFramePrivate.m:
(-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
* WebView.subproj/WebMainResourceClient.m:
(-[WebMainResourceClient resource:willSendRequest:]):
WebBrowser:
Reviewed by Maciej
Finished conversion to NSMutableURLRequest. HTTP-specific
mutator methods are now properly placed on an HTTP
category of NSMutableURLRequest. All client code has
been updated to use NSMutableURLRequest where appropriate.
* LocationChangeHandler.m:
(-[LocationChangeHandler unknownRootSheetDidEnd:returnCode:contextInfo:]):
(-[LocationChangeHandler webView:locationChangeDone:forDataSource:]):
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@3922 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 73caf4e..7e9efe2 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,3 +1,26 @@
+2003-03-26 Ken Kocienda <kocienda at apple.com>
+
+ Reviewed by Maciej
+
+ Finished conversion to NSMutableURLRequest. HTTP-specific
+ mutator methods are now properly placed on an HTTP
+ category of NSMutableURLRequest. All client code has
+ been updated to use NSMutableURLRequest where appropriate.
+
+ * Misc.subproj/WebIconLoader.m:
+ (-[WebIconLoader startLoading]):
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge createWindowWithURL:frameName:]):
+ * WebView.subproj/WebBaseResourceHandleDelegate.m:
+ (-[WebBaseResourceHandleDelegate resource:willSendRequest:]):
+ * WebView.subproj/WebDefaultContextMenuDelegate.m:
+ (-[WebDefaultContextMenuDelegate openNewWindowWithURL:]):
+ * WebView.subproj/WebFramePrivate.h:
+ * WebView.subproj/WebFramePrivate.m:
+ (-[WebFrame _addExtraFieldsToRequest:alwaysFromRequest:]):
+ * WebView.subproj/WebMainResourceClient.m:
+ (-[WebMainResourceClient resource:willSendRequest:]):
+
2003-03-25 Richard Williamson <rjw at apple.com>
Changed use of plugin to plugIn in our public API
diff --git a/WebKit/Misc.subproj/WebIconLoader.m b/WebKit/Misc.subproj/WebIconLoader.m
index 7156e08..c3fd26d 100644
--- a/WebKit/Misc.subproj/WebIconLoader.m
+++ b/WebKit/Misc.subproj/WebIconLoader.m
@@ -85,7 +85,7 @@
return;
}
- NSURLRequest *request = [[NSURLRequest alloc] initWithURL:_private->URL];
+ NSMutableURLRequest *request = [[NSMutableURLRequest alloc] initWithURL:_private->URL];
[request HTTPSetPageNotFoundCacheLifetime:WebIconLoaderWeeksWorthOfSeconds];
_private->handle = [[WebResource alloc] initWithRequest:request];
[_private->handle loadWithDelegate:self];
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index 10d502f..6b1a15c 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -106,10 +106,10 @@
{
ASSERT(frame != nil);
- NSURLRequest *request = nil;
+ NSMutableURLRequest *request = nil;
if (URL != nil && [URL length] > 0) {
- request = [NSURLRequest requestWithURL:[NSURL _web_URLWithString:URL]];
+ request = [NSMutableURLRequest requestWithURL:[NSURL _web_URLWithString:URL]];
[request HTTPSetReferrer:[self referrer]];
}
diff --git a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
index d6bfc29..02f0c17 100644
--- a/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
+++ b/WebKit/WebView.subproj/WebBaseResourceHandleDelegate.m
@@ -135,8 +135,11 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [newRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
-
+ NSMutableURLRequest *mutableRequest = [newRequest mutableCopy];
+ [mutableRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ newRequest = [mutableRequest autorelease];
+
+
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
diff --git a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
index 2ccbea1..707bfe2 100644
--- a/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
+++ b/WebKit/WebView.subproj/WebDefaultContextMenuDelegate.m
@@ -143,7 +143,7 @@ static WebDefaultContextMenuDelegate *sharedDelegate = nil;
WebFrame *webFrame = [element objectForKey:WebElementFrameKey];
WebView *controller = [webFrame webView];
- NSURLRequest *request = [NSURLRequest requestWithURL:URL];
+ NSMutableURLRequest *request = [NSMutableURLRequest requestWithURL:URL];
NSString *referrer = [[webFrame _bridge] referrer];
if (referrer) {
[request HTTPSetReferrer:referrer];
diff --git a/WebKit/WebView.subproj/WebFramePrivate.h b/WebKit/WebView.subproj/WebFramePrivate.h
index 5088d76..8dc570f 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.h
+++ b/WebKit/WebView.subproj/WebFramePrivate.h
@@ -15,6 +15,7 @@
@class WebFrameView;
@class WebHistoryItem;
@class NSURLRequest;
+ at class NSMutableURLRequest;
@class WebPolicyDecisionListener;
@class WebView;
@@ -124,7 +125,7 @@ typedef enum {
- (void)_setLoadType: (WebFrameLoadType)loadType;
- (WebFrameLoadType)_loadType;
-- (void)_addExtraFieldsToRequest:(NSURLRequest *)request alwaysFromRequest: (BOOL)f;
+- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f;
- (void)_checkNewWindowPolicyForRequest:(NSURLRequest *)request action:(NSDictionary *)action frameName:(NSString *)frameName formState:(WebFormState *)formState andCall:(id)target withSelector:(SEL)selector;
diff --git a/WebKit/WebView.subproj/WebFramePrivate.m b/WebKit/WebView.subproj/WebFramePrivate.m
index 0e63d39..ac38272 100644
--- a/WebKit/WebView.subproj/WebFramePrivate.m
+++ b/WebKit/WebView.subproj/WebFramePrivate.m
@@ -1481,7 +1481,7 @@ static CFAbsoluteTime _timeOfLastCompletedLoad;
[[[self webView] _locationChangeDelegateForwarder] webView: _private->controller locationChangedWithinPageForDataSource:dataSrc];
}
-- (void)_addExtraFieldsToRequest:(NSURLRequest *)request alwaysFromRequest: (BOOL)f
+- (void)_addExtraFieldsToRequest:(NSMutableURLRequest *)request alwaysFromRequest: (BOOL)f
{
[request HTTPSetUserAgent:[[self webView] userAgentForURL:[request URL]]];
diff --git a/WebKit/WebView.subproj/WebLoader.m b/WebKit/WebView.subproj/WebLoader.m
index d6bfc29..02f0c17 100644
--- a/WebKit/WebView.subproj/WebLoader.m
+++ b/WebKit/WebView.subproj/WebLoader.m
@@ -135,8 +135,11 @@
ASSERT(resource == h);
ASSERT(!reachedTerminalState);
- [newRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
-
+ NSMutableURLRequest *mutableRequest = [newRequest mutableCopy];
+ [mutableRequest HTTPSetUserAgent:[controller userAgentForURL:[newRequest URL]]];
+ newRequest = [mutableRequest autorelease];
+
+
if (identifier == nil) {
// The identifier is released after the last callback, rather than in dealloc
// to avoid potential cycles.
diff --git a/WebKit/WebView.subproj/WebMainResourceClient.m b/WebKit/WebView.subproj/WebMainResourceClient.m
index 635d12c..a38d57f 100644
--- a/WebKit/WebView.subproj/WebMainResourceClient.m
+++ b/WebKit/WebView.subproj/WebMainResourceClient.m
@@ -115,7 +115,9 @@
// 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 HTTPSetCookiePolicyBaseURL:URL];
+ NSMutableURLRequest *mutableRequest = [newRequest mutableCopy];
+ [mutableRequest HTTPSetCookiePolicyBaseURL:URL];
+ newRequest = [mutableRequest autorelease];
}
// 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 635d12c..a38d57f 100644
--- a/WebKit/WebView.subproj/WebMainResourceLoader.m
+++ b/WebKit/WebView.subproj/WebMainResourceLoader.m
@@ -115,7 +115,9 @@
// 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 HTTPSetCookiePolicyBaseURL:URL];
+ NSMutableURLRequest *mutableRequest = [newRequest mutableCopy];
+ [mutableRequest HTTPSetCookiePolicyBaseURL:URL];
+ newRequest = [mutableRequest autorelease];
}
// 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