Prevent requests for http://host:port/ from being sent over an existing spdy session to https://hos…

net/http/http_stream_factory_impl_job.cc

Index: net/http/http_stream_factory_impl_job.cc
diff --git a/net/http/http_stream_factory_impl_job.cc b/net/http/http_stream_factory_impl_job.cc
index 15cba9d2a5737b5be89ecc9e494098dd00cdb416..c037f5d6bdf82b4b433774c1f9ccca0e4c1db676 100644
--- a/net/http/http_stream_factory_impl_job.cc
+++ b/net/http/http_stream_factory_impl_job.cc
@@ -680,7 +680,9 @@ int HttpStreamFactoryImpl::Job::DoInitConnection() {
   }
   scoped_refptr<SpdySession> spdy_session =
       session_->spdy_session_pool()->GetIfExists(spdy_session_key, net_log_);
-  if (spdy_session) {
+  if (spdy_session && (request_info_.url.SchemeIs("https") ||

[willchan no longer on Chromium, 2012/06/29 17:19:45]

Please add comments explaining what this condition is checking for. Also,
there's stuff going on with the spdy_session_key in the previous lookup which
should be better documented here.

[Ryan Hamilton, 2012/06/29 17:37:34]

Done.

+                       proxy_info_.proxy_server().is_https() ||
+                       force_spdy_always_)) {
     // If we're preconnecting, but we already have a SpdySession, we don't
     // actually need to preconnect any sockets, so we're done.
     if (IsPreconnecting())