Title: [170205] trunk/Source
- Revision
- 170205
- Author
- ander...@apple.com
- Date
- 2014-06-20 14:03:37 -0700 (Fri, 20 Jun 2014)
Log Message
Give NPAPI post requests a default content type
https://bugs.webkit.org/show_bug.cgi?id=134120
Reviewed by Andreas Kling.
Source/WebCore:
* WebCore.exp.in:
Source/WebKit2:
* WebProcess/Plugins/PluginView.cpp:
(WebKit::PluginView::loadURL):
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (170204 => 170205)
--- trunk/Source/WebCore/ChangeLog 2014-06-20 21:00:53 UTC (rev 170204)
+++ trunk/Source/WebCore/ChangeLog 2014-06-20 21:03:37 UTC (rev 170205)
@@ -1,3 +1,12 @@
+2014-06-20 Anders Carlsson <ander...@apple.com>
+
+ Give NPAPI post requests a default content type
+ https://bugs.webkit.org/show_bug.cgi?id=134120
+
+ Reviewed by Andreas Kling.
+
+ * WebCore.exp.in:
+
2014-06-20 Simon Fraser <simon.fra...@apple.com>
REGRESSION (r169972): fix issue when removing masks from compositing layers
Modified: trunk/Source/WebCore/WebCore.exp.in (170204 => 170205)
--- trunk/Source/WebCore/WebCore.exp.in 2014-06-20 21:00:53 UTC (rev 170204)
+++ trunk/Source/WebCore/WebCore.exp.in 2014-06-20 21:03:37 UTC (rev 170205)
@@ -817,6 +817,7 @@
__ZN7WebCore19ResourceRequestBase11setHTTPBodyEN3WTF10PassRefPtrINS_8FormDataEEE
__ZN7WebCore19ResourceRequestBase13setHTTPMethodERKN3WTF6StringE
__ZN7WebCore19ResourceRequestBase15setHTTPReferrerERKN3WTF6StringE
+__ZN7WebCore19ResourceRequestBase18setHTTPContentTypeERKN3WTF6StringE
__ZN7WebCore19ResourceRequestBase19setHTTPHeaderFieldsENS_13HTTPHeaderMapE
__ZN7WebCore19ResourceRequestBase22defaultTimeoutIntervalEv
__ZN7WebCore19ResourceRequestBase24s_defaultTimeoutIntervalE
@@ -1785,6 +1786,7 @@
__ZNK7WebCore19MediaSessionManager30applicationWillEnterBackgroundEv
__ZNK7WebCore19MediaSessionManager30applicationWillEnterForegroundEv
__ZNK7WebCore19ResourceRequestBase10httpMethodEv
+__ZNK7WebCore19ResourceRequestBase15httpContentTypeEv
__ZNK7WebCore19ResourceRequestBase20firstPartyForCookiesEv
__ZNK7WebCore19ResourceRequestBase3urlEv
__ZNK7WebCore19ResourceRequestBase6isNullEv
Modified: trunk/Source/WebKit2/ChangeLog (170204 => 170205)
--- trunk/Source/WebKit2/ChangeLog 2014-06-20 21:00:53 UTC (rev 170204)
+++ trunk/Source/WebKit2/ChangeLog 2014-06-20 21:03:37 UTC (rev 170205)
@@ -1,3 +1,13 @@
+2014-06-20 Anders Carlsson <ander...@apple.com>
+
+ Give NPAPI post requests a default content type
+ https://bugs.webkit.org/show_bug.cgi?id=134120
+
+ Reviewed by Andreas Kling.
+
+ * WebProcess/Plugins/PluginView.cpp:
+ (WebKit::PluginView::loadURL):
+
2014-06-20 Simon Fraser <simon.fra...@apple.com>
Always commit the scrolling tree when we flush layers
Modified: trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp (170204 => 170205)
--- trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-20 21:00:53 UTC (rev 170204)
+++ trunk/Source/WebKit2/WebProcess/Plugins/PluginView.cpp 2014-06-20 21:03:37 UTC (rev 170205)
@@ -1336,7 +1336,12 @@
frameLoadRequest.resourceRequest().setHTTPMethod(method);
frameLoadRequest.resourceRequest().setURL(m_pluginElement->document().completeURL(urlString));
frameLoadRequest.resourceRequest().setHTTPHeaderFields(headerFields);
- frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(httpBody.data(), httpBody.size()));
+ if (!httpBody.isEmpty()) {
+ frameLoadRequest.resourceRequest().setHTTPBody(FormData::create(httpBody.data(), httpBody.size()));
+ if (frameLoadRequest.resourceRequest().httpContentType().isEmpty())
+ frameLoadRequest.resourceRequest().setHTTPContentType("application/x-www-form-urlencoded");
+ }
+
frameLoadRequest.setFrameName(target);
String referrer = SecurityPolicy::generateReferrerHeader(frame()->document()->referrerPolicy(), frameLoadRequest.resourceRequest().url(), frame()->loader().outgoingReferrer());
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
