summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_proxy_client_socket.cc
diff options
context:
space:
mode:
authorrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 15:33:52 +0000
committerrch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-10-20 15:33:52 +0000
commit7213e7cddc25d53822bd7bcad1e56b700ed0723a (patch)
treef2ad70306305b8baf875f8220eb33722ce9e9854 /net/spdy/spdy_proxy_client_socket.cc
parent54e6e79cce665b06c965d58852f0c6362b9ba567 (diff)
downloadchromium_src-7213e7cddc25d53822bd7bcad1e56b700ed0723a.zip
chromium_src-7213e7cddc25d53822bd7bcad1e56b700ed0723a.tar.gz
chromium_src-7213e7cddc25d53822bd7bcad1e56b700ed0723a.tar.bz2
Move BuildRequestHeaders from HttpNetworkTransaction to
HttpUtil::BuildRequestHeaders, so that it can be used directly by SpdyHttpStream, removing the code duplication. Strip proxy-connection header from SPDY requests to be consistent with Connection header. BUG=none TEST=none Review URL: http://codereview.chromium.org/3831005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@63213 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_proxy_client_socket.cc')
-rw-r--r--net/spdy/spdy_proxy_client_socket.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/net/spdy/spdy_proxy_client_socket.cc b/net/spdy/spdy_proxy_client_socket.cc
index c8a0153..53bcb0d 100644
--- a/net/spdy/spdy_proxy_client_socket.cc
+++ b/net/spdy/spdy_proxy_client_socket.cc
@@ -312,7 +312,8 @@ int SpdyProxyClientSocket::DoSendRequest() {
request_.extra_headers.MergeFrom(request_headers);
linked_ptr<spdy::SpdyHeaderBlock> headers(new spdy::SpdyHeaderBlock());
- CreateSpdyHeadersFromHttpRequest(request_, headers.get(), true);
+ CreateSpdyHeadersFromHttpRequest(request_, request_headers, headers.get(),
+ true);
// Reset the URL to be the endpoint of the connection
(*headers)["url"] = endpoint_.ToString();
headers->erase("scheme");