X-Git-Url: https://git.webkit.org/?p=WebKit-https.git;a=blobdiff_plain;f=Source%2FWebCore%2Fplatform%2Fnetwork%2Fsoup%2FResourceRequestSoup.cpp;h=b5a4a0dda7022b64bde809687fd69cc77a6fb763;hp=2e6b3a6406fb34e7df5a9d2c3e96e5bb53dd5f14;hb=08413889b806658fdd34ef41421d66ae202a7edb;hpb=02b734de20866063560382916e54451a658eee77 diff --git a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp index 2e6b3a6406fb..b5a4a0dda702 100644 --- a/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp +++ b/Source/WebCore/platform/network/soup/ResourceRequestSoup.cpp @@ -32,6 +32,22 @@ using namespace std; namespace WebCore { +void ResourceRequest::updateSoupMessageMembers(SoupMessage* soupMessage) const +{ + updateSoupMessageHeaders(soupMessage->request_headers); + + String firstPartyString = firstPartyForCookies().string(); + if (!firstPartyString.isEmpty()) { + GOwnPtr 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 @@ void ResourceRequest::updateSoupMessage(SoupMessage* soupMessage) const GOwnPtr uri(soupURI()); soup_message_set_uri(soupMessage, uri.get()); - updateSoupMessageHeaders(soupMessage->request_headers); - - String firstPartyString = firstPartyForCookies().string(); - if (!firstPartyString.isEmpty()) { - GOwnPtr 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 @@ SoupMessage* ResourceRequest::toSoupMessage() const 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