Title: [155049] trunk/Source/WebCore
- Revision
- 155049
- Author
- [email protected]
- Date
- 2013-09-04 10:53:59 -0700 (Wed, 04 Sep 2013)
Log Message
REGRESSION(r154977): Do not urlencode soup message on ResourceRequest::toSoupMessage()
https://bugs.webkit.org/show_bug.cgi?id=120681
Patch by Andre Moreira Magalhaes <[email protected]> on 2013-09-04
Reviewed by Martin Robinson.
Do not call soup_message_set_uri with soupURI() (url encoded uri) on
ResourceRequest::toSoupMessage().
* platform/network/soup/ResourceRequest.h:
* platform/network/soup/ResourceRequestSoup.cpp:
(WebCore::ResourceRequest::updateSoupMessageMembers):
(WebCore::ResourceRequest::updateSoupMessage):
(WebCore::ResourceRequest::toSoupMessage):
Split common code from updateSoupMessage/toSoupMessage into updateSoupMessageMembers.
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (155048 => 155049)
--- trunk/Source/WebCore/ChangeLog 2013-09-04 17:39:03 UTC (rev 155048)
+++ trunk/Source/WebCore/ChangeLog 2013-09-04 17:53:59 UTC (rev 155049)
@@ -1,3 +1,20 @@
+2013-09-04 Andre Moreira Magalhaes <[email protected]>
+
+ REGRESSION(r154977): Do not urlencode soup message on ResourceRequest::toSoupMessage()
+ https://bugs.webkit.org/show_bug.cgi?id=120681
+
+ Reviewed by Martin Robinson.
+
+ Do not call soup_message_set_uri with soupURI() (url encoded uri) on
+ ResourceRequest::toSoupMessage().
+
+ * platform/network/soup/ResourceRequest.h:
+ * platform/network/soup/ResourceRequestSoup.cpp:
+ (WebCore::ResourceRequest::updateSoupMessageMembers):
+ (WebCore::ResourceRequest::updateSoupMessage):
+ (WebCore::ResourceRequest::toSoupMessage):
+ Split common code from updateSoupMessage/toSoupMessage into updateSoupMessageMembers.
+
2013-09-04 Danilo Cesar Lemes de Paula <[email protected]>
[GTK] add support for subtitles on webkit2GTK
Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequest.h (155048 => 155049)
--- trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2013-09-04 17:39:03 UTC (rev 155048)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequest.h 2013-09-04 17:53:59 UTC (rev 155049)
@@ -93,6 +93,7 @@
bool m_acceptEncoding : 1;
SoupMessageFlags m_soupFlags;
+ void updateSoupMessageMembers(SoupMessage*) const;
void doUpdatePlatformRequest() { }
void doUpdateResourceRequest() { }
void doUpdatePlatformHTTPBody() { }
Modified: trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp (155048 => 155049)
--- trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2013-09-04 17:39:03 UTC (rev 155048)
+++ trunk/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp 2013-09-04 17:53:59 UTC (rev 155049)
@@ -32,6 +32,22 @@
namespace WebCore {
+void ResourceRequest::updateSoupMessageMembers(SoupMessage* soupMessage) const
+{
+ updateSoupMessageHeaders(soupMessage->request_headers);
+
+ String firstPartyString = firstPartyForCookies().string();
+ if (!firstPartyString.isEmpty()) {
+ GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
+ soup_message_set_first_party(soupMessage, firstParty.get());
+ }
+
+ soup_message_set_flags(soupMessage, m_soupFlags);
+
+ if (!acceptEncoding())
+ soup_message_disable_feature(soupMessage, SOUP_TYPE_CONTENT_DECODER);
+}
+
void ResourceRequest::updateSoupMessageHeaders(SoupMessageHeaders* soupHeaders) const
{
const HTTPHeaderMap& headers = httpHeaderFields();
@@ -60,18 +76,7 @@
GOwnPtr<SoupURI> uri(soupURI());
soup_message_set_uri(soupMessage, uri.get());
- updateSoupMessageHeaders(soupMessage->request_headers);
-
- String firstPartyString = firstPartyForCookies().string();
- if (!firstPartyString.isEmpty()) {
- GOwnPtr<SoupURI> firstParty(soup_uri_new(firstPartyString.utf8().data()));
- soup_message_set_first_party(soupMessage, firstParty.get());
- }
-
- soup_message_set_flags(soupMessage, m_soupFlags);
-
- if (!acceptEncoding())
- soup_message_disable_feature(soupMessage, SOUP_TYPE_CONTENT_DECODER);
+ updateSoupMessageMembers(soupMessage);
}
SoupMessage* ResourceRequest::toSoupMessage() const
@@ -80,7 +85,7 @@
if (!soupMessage)
return 0;
- updateSoupMessage(soupMessage);
+ updateSoupMessageMembers(soupMessage);
// Body data is only handled at ResourceHandleSoup::startHttp for
// now; this is because this may not be a good place to go
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
