[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.1.15-1-40151-g37bb677
darin
darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc
Sat Sep 26 06:47:39 UTC 2009
The following commit has been merged in the debian/unstable branch:
commit fde25760afc1eeaeefcab77a45065c170322fd8e
Author: darin <darin at 268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Mon Oct 7 22:20:36 2002 +0000
WebFoundation:
WebFoundation part of implementation of multipart forms posting.
* ProtocolHandlers.subproj/WebSimpleHTTPProtocolHandler.m:
(-[WebSimpleHTTPProtocolHandler _addRequestMessageBody:]):
* ProtocolHandlers.subproj/WebCFNetworkHTTPProtocolHandler.m:
(-[WebCFNetworkHTTPProtocolHandler addRequestMessageBody:]):
Remove obsolete support for non-NSData form data. Use the contentType
in the request, if present.
* ProtocolHandlers.subproj/WebHTTPResourceRequest.h: Add contentType
and setContentType methods; convenience for setting the Content-Type header.
* ProtocolHandlers.subproj/WebHTTPResourceRequest.m:
(-[WebResourceRequest _headerForKey:]): Added.
(-[WebResourceRequest userAgent]): Use _headerForKey.
(-[WebResourceRequest referrer]): Ditto.
(-[WebResourceRequest contentType]): Added. Use _headerForKey.
(-[WebResourceRequest setContentType:]): Added.
* ProtocolHandlers.subproj/WebHTTPProtocolHandler.h: Remove requestData.
* ProtocolHandlers.subproj/WebHTTPProtocolHandler.m: Ditto.
WebCore:
WebCore part of implementation of multipart forms posting.
* kwq/WebCoreBridge.h: Add a contentType parameter to the bridge's
[postWithURL:referrer:data:] method.
* kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::submitForm):
Extract the content type from the args, and pass it along to the bridge.
WebKit:
WebKit part of implementation of multipart forms posting.
* WebCoreSupport.subproj/WebBridge.m:
(-[WebBridge postWithURL:referrer:data:contentType:]):
Add a contentType parameter to match change in WebCore API.
Put the contentType value into the request.
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@2270 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebCore/ChangeLog-2002-12-03 b/WebCore/ChangeLog-2002-12-03
index 47da0b6..e135a3c 100644
--- a/WebCore/ChangeLog-2002-12-03
+++ b/WebCore/ChangeLog-2002-12-03
@@ -1,5 +1,15 @@
2002-10-07 Darin Adler <darin at apple.com>
+ WebCore part of implementation of multipart forms posting.
+
+ * kwq/WebCoreBridge.h: Add a contentType parameter to the bridge's
+ [postWithURL:referrer:data:] method.
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::submitForm):
+ Extract the content type from the args, and pass it along to the bridge.
+
+2002-10-07 Darin Adler <darin at apple.com>
+
- fixed 3011025 -- Page up/down is not working when text area has focus
* kwq/KWQTextArea.mm:
diff --git a/WebCore/ChangeLog-2003-10-25 b/WebCore/ChangeLog-2003-10-25
index 47da0b6..e135a3c 100644
--- a/WebCore/ChangeLog-2003-10-25
+++ b/WebCore/ChangeLog-2003-10-25
@@ -1,5 +1,15 @@
2002-10-07 Darin Adler <darin at apple.com>
+ WebCore part of implementation of multipart forms posting.
+
+ * kwq/WebCoreBridge.h: Add a contentType parameter to the bridge's
+ [postWithURL:referrer:data:] method.
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::submitForm):
+ Extract the content type from the args, and pass it along to the bridge.
+
+2002-10-07 Darin Adler <darin at apple.com>
+
- fixed 3011025 -- Page up/down is not working when text area has focus
* kwq/KWQTextArea.mm:
diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 47da0b6..e135a3c 100644
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,5 +1,15 @@
2002-10-07 Darin Adler <darin at apple.com>
+ WebCore part of implementation of multipart forms posting.
+
+ * kwq/WebCoreBridge.h: Add a contentType parameter to the bridge's
+ [postWithURL:referrer:data:] method.
+
+ * kwq/KWQKHTMLPartImpl.mm: (KWQKHTMLPartImpl::submitForm):
+ Extract the content type from the args, and pass it along to the bridge.
+
+2002-10-07 Darin Adler <darin at apple.com>
+
- fixed 3011025 -- Page up/down is not working when text area has focus
* kwq/KWQTextArea.mm:
diff --git a/WebCore/kwq/KWQKHTMLPart.mm b/WebCore/kwq/KWQKHTMLPart.mm
index 7fea63b..5971993 100644
--- a/WebCore/kwq/KWQKHTMLPart.mm
+++ b/WebCore/kwq/KWQKHTMLPart.mm
@@ -238,8 +238,11 @@ void KWQKHTMLPartImpl::submitForm(const KURL &u, const URLArgs &args)
if (!args.doPost()) {
[bridgeForFrameName(args.frameName) loadURL:u.getNSURL() referrer:referrer(args)];
} else {
- NSData *postData = [NSData dataWithBytes:args.postData.data() length:args.postData.size()];
- [bridgeForFrameName(args.frameName) postWithURL:u.getNSURL() referrer:referrer(args) data:postData];
+ QString contentType = args.contentType();
+ ASSERT(contentType.startsWith("Content-Type: "));
+ [bridgeForFrameName(args.frameName) postWithURL:u.getNSURL() referrer:referrer(args)
+ data:[NSData dataWithBytes:args.postData.data() length:args.postData.size()]
+ contentType:contentType.mid(14).getNSString()];
}
}
diff --git a/WebCore/kwq/KWQKHTMLPartImpl.mm b/WebCore/kwq/KWQKHTMLPartImpl.mm
index 7fea63b..5971993 100644
--- a/WebCore/kwq/KWQKHTMLPartImpl.mm
+++ b/WebCore/kwq/KWQKHTMLPartImpl.mm
@@ -238,8 +238,11 @@ void KWQKHTMLPartImpl::submitForm(const KURL &u, const URLArgs &args)
if (!args.doPost()) {
[bridgeForFrameName(args.frameName) loadURL:u.getNSURL() referrer:referrer(args)];
} else {
- NSData *postData = [NSData dataWithBytes:args.postData.data() length:args.postData.size()];
- [bridgeForFrameName(args.frameName) postWithURL:u.getNSURL() referrer:referrer(args) data:postData];
+ QString contentType = args.contentType();
+ ASSERT(contentType.startsWith("Content-Type: "));
+ [bridgeForFrameName(args.frameName) postWithURL:u.getNSURL() referrer:referrer(args)
+ data:[NSData dataWithBytes:args.postData.data() length:args.postData.size()]
+ contentType:contentType.mid(14).getNSString()];
}
}
diff --git a/WebCore/kwq/WebCoreBridge.h b/WebCore/kwq/WebCoreBridge.h
index 4119a92..afa867a 100644
--- a/WebCore/kwq/WebCoreBridge.h
+++ b/WebCore/kwq/WebCoreBridge.h
@@ -147,7 +147,7 @@ typedef khtml::RenderPart KHTMLRenderPart;
- (WebCoreBridge *)frameNamed:(NSString *)name; // searches entire hierarchy starting with mainFrame
- (void)loadURL:(NSURL *)URL referrer:(NSString *)referrer;
-- (void)postWithURL:(NSURL *)URL referrer:(NSString *)referrer data:(NSData *)data;
+- (void)postWithURL:(NSURL *)URL referrer:(NSString *)referrer data:(NSData *)data contentType:(NSString *)contentType;
- (WebCoreBridge *)openNewWindowWithURL:(NSURL *)URL referrer:(NSString *)referrer frameName:(NSString *)name;
- (NSString *)userAgentForURL:(NSURL *)URL;
diff --git a/WebKit/ChangeLog b/WebKit/ChangeLog
index 126d76e..835e928 100644
--- a/WebKit/ChangeLog
+++ b/WebKit/ChangeLog
@@ -1,9 +1,19 @@
+2002-10-07 Darin Adler <darin at apple.com>
+
+ WebKit part of implementation of multipart forms posting.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge postWithURL:referrer:data:contentType:]):
+ Add a contentType parameter to match change in WebCore API.
+ Put the contentType value into the request.
+
2002-10-07 Chris Blumenberg <cblu at apple.com>
-` Icing fix for: 3063517 - crash loading .png in separate window
+ Icing fix for: 3063517 - crash loading .png in separate window
* Plugins.subproj/WebPluginDatabase.m:
- (-[WebNetscapePluginDatabase init]): Don't override document view and rep types for types that have already been registered.
+ (-[WebNetscapePluginDatabase init]): Don't override document view and rep
+ types for types that have already been registered.
2002-10-07 Darin Adler <darin at apple.com>
diff --git a/WebKit/ChangeLog-2002-12-03 b/WebKit/ChangeLog-2002-12-03
index 126d76e..835e928 100644
--- a/WebKit/ChangeLog-2002-12-03
+++ b/WebKit/ChangeLog-2002-12-03
@@ -1,9 +1,19 @@
+2002-10-07 Darin Adler <darin at apple.com>
+
+ WebKit part of implementation of multipart forms posting.
+
+ * WebCoreSupport.subproj/WebBridge.m:
+ (-[WebBridge postWithURL:referrer:data:contentType:]):
+ Add a contentType parameter to match change in WebCore API.
+ Put the contentType value into the request.
+
2002-10-07 Chris Blumenberg <cblu at apple.com>
-` Icing fix for: 3063517 - crash loading .png in separate window
+ Icing fix for: 3063517 - crash loading .png in separate window
* Plugins.subproj/WebPluginDatabase.m:
- (-[WebNetscapePluginDatabase init]): Don't override document view and rep types for types that have already been registered.
+ (-[WebNetscapePluginDatabase init]): Don't override document view and rep
+ types for types that have already been registered.
2002-10-07 Darin Adler <darin at apple.com>
diff --git a/WebKit/WebCoreSupport.subproj/WebBridge.m b/WebKit/WebCoreSupport.subproj/WebBridge.m
index bd96b19..81aadfa 100644
--- a/WebKit/WebCoreSupport.subproj/WebBridge.m
+++ b/WebKit/WebCoreSupport.subproj/WebBridge.m
@@ -278,7 +278,7 @@
[request release];
}
-- (void)postWithURL:(NSURL *)URL referrer:(NSString *)referrer data:(NSData *)data
+- (void)postWithURL:(NSURL *)URL referrer:(NSString *)referrer data:(NSData *)data contentType:(NSString *)contentType
{
// When posting, use the WebResourceHandleFlagLoadFromOrigin load flag.
// This prevents a potential bug which may cause a page
@@ -288,6 +288,7 @@
[request setRequestCachePolicy:WebRequestCachePolicyLoadFromOrigin];
[request setMethod:@"POST"];
[request setData:data];
+ [request setContentType:contentType];
[request setReferrer:referrer];
[self loadRequest:request withParent:[[frame dataSource] parent]];
[request release];
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list