summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 01:10:43 +0000
committermbelshe@chromium.org <mbelshe@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-09 01:10:43 +0000
commit81af494a18d1c509b52b368943859cc4c5704b82 (patch)
tree2d3bc0fcf09d87ebac2acea8a98e26f7897107ea
parent8ed2d73d12fe656de95cd707557ccdd87af1e08b (diff)
downloadchromium_src-81af494a18d1c509b52b368943859cc4c5704b82.zip
chromium_src-81af494a18d1c509b52b368943859cc4c5704b82.tar.gz
chromium_src-81af494a18d1c509b52b368943859cc4c5704b82.tar.bz2
Don't set SSLInfo on non-https requests. For SPDY with self-signed certs
this can lead to no caching. BUG=65809 TEST=none Review URL: http://codereview.chromium.org/5625011 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@68682 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--net/spdy/spdy_http_stream.cc5
1 files changed, 4 insertions, 1 deletions
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index fedadd7..5d27ee1 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -259,7 +259,10 @@ int SpdyHttpStream::OnResponseReceived(const spdy::SpdyHeaderBlock& response,
}
response_headers_received_ = true;
- stream_->GetSSLInfo(&response_info_->ssl_info,
+ // Don't store the SSLInfo in the response here, HttpNetworkTransaction
+ // will take care of that part.
+ SSLInfo ssl_info;
+ stream_->GetSSLInfo(&ssl_info,
&response_info_->was_npn_negotiated);
response_info_->request_time = stream_->GetRequestTime();
response_info_->vary_data.Init(*request_info_, *response_info_->headers);