diff options
| author | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:38:43 +0000 |
|---|---|---|
| committer | eroman@chromium.org <eroman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-25 01:38:43 +0000 |
| commit | 733b7a6d83ad1c1394408f1c089cee2068135d44 (patch) | |
| tree | b1ef08e4d72977d440a63045dfff94047b063ee4 /net/http | |
| parent | 7a7a13b4d8ff1e790da262addcdeb84232539ebe (diff) | |
| download | chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.zip chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.tar.gz chromium_src-733b7a6d83ad1c1394408f1c089cee2068135d44.tar.bz2 | |
Make sure the key into the spdy session pool identifies the actual proxy used, and not the full list of possible proxies for the URL.
BUG=52668
TEST=SpdyNetworkTransactionTest.DirectConnectProxyReconnect
Review URL: http://codereview.chromium.org/3192011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57274 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_stream_request.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/net/http/http_stream_request.cc b/net/http/http_stream_request.cc index 6ee73d2..3e9b157 100644 --- a/net/http/http_stream_request.cc +++ b/net/http/http_stream_request.cc @@ -423,7 +423,7 @@ int HttpStreamRequest::DoInitConnection() { // Check first if we have a spdy session for this group. If so, then go // straight to using that. - HostPortProxyPair pair(endpoint_, proxy_info()->ToPacString()); + HostPortProxyPair pair(endpoint_, proxy_info()->proxy_server().ToPacString()); if (session_->spdy_session_pool()->HasSession(pair)) { using_spdy_ = true; next_state_ = STATE_INIT_STREAM; @@ -684,7 +684,8 @@ int HttpStreamRequest::DoInitStream() { session_->spdy_session_pool(); scoped_refptr<SpdySession> spdy_session; - HostPortProxyPair pair(endpoint_, proxy_info()->ToPacString()); + HostPortProxyPair pair(endpoint_, + proxy_info()->proxy_server().ToPacString()); if (session_->spdy_session_pool()->HasSession(pair)) { spdy_session = session_->spdy_session_pool()->Get(pair, session_, net_log_); |