diff options
author | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2012-10-17 16:21:14 +0200 |
commit | 8995b83bcbfbb68245f779b64e5517627c6cc6ea (patch) | |
tree | 17985605dab9263cc2444bd4d45f189e142cca7c /Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp | |
parent | b9c9652036d5e9f1e29c574f40bc73a35c81ace6 (diff) |
Imported WebKit commit cf4f8fc6f19b0629f51860cb2d4b25e139d07e00 (http://svn.webkit.org/repository/webkit/trunk@131592)
New snapshot that includes the build fixes for Mac OS X 10.6 and earlier as well
as the previously cherry-picked changes
Diffstat (limited to 'Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp')
-rw-r--r-- | Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp index ddfa1c38d..96e23a98a 100644 --- a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp +++ b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp @@ -43,7 +43,7 @@ void ResourceRequest::updateSoupMessage(SoupMessage* soupMessage) const if (!headers.isEmpty()) { HTTPHeaderMap::const_iterator end = headers.end(); for (HTTPHeaderMap::const_iterator it = headers.begin(); it != end; ++it) - soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data()); + soup_message_headers_append(soupHeaders, it->key.string().utf8().data(), it->value.utf8().data()); } String firstPartyString = firstPartyForCookies().string(); @@ -66,7 +66,7 @@ SoupMessage* ResourceRequest::toSoupMessage() const if (!headers.isEmpty()) { HTTPHeaderMap::const_iterator end = headers.end(); for (HTTPHeaderMap::const_iterator it = headers.begin(); it != end; ++it) - soup_message_headers_append(soupHeaders, it->first.string().utf8().data(), it->second.utf8().data()); + soup_message_headers_append(soupHeaders, it->key.string().utf8().data(), it->value.utf8().data()); } String firstPartyString = firstPartyForCookies().string(); @@ -124,4 +124,11 @@ unsigned initializeMaximumHTTPConnectionCountPerHost() return 10000; } +String ResourceRequest::urlStringForSoup() const +{ + KURL url = m_url; + url.removeFragmentIdentifier(); + return url.string(); +} + } |