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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/http/http_stream_factory_impl_job.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 662 matching lines @@
   HostPortProxyPair spdy_session_key;
   if (IsHttpsProxyAndHttpUrl()) {
     spdy_session_key =
         HostPortProxyPair(proxy_info_.proxy_server().host_port_pair(),
                           ProxyServer::Direct());
   } else {
     spdy_session_key = HostPortProxyPair(origin_, proxy_info_.proxy_server());
   }
   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())
       return OK;
     using_spdy_ = true;
     next_state_ = STATE_CREATE_STREAM;
     existing_spdy_session_ = spdy_session;
     return OK;
   } else if (request_ && (using_ssl_ || ShouldForceSpdyWithoutSSL())) {
     // Update the spdy session key for the request that launched this job.
@@ skipping 579 matching lines @@
       (net::LOAD_MAIN_FRAME | net::LOAD_SUB_FRAME | net::LOAD_PREFETCH |
        net::LOAD_IS_DOWNLOAD)) {
     // Avoid pipelining resources that may be streamed for a long time.
     return false;
   }
   return stream_factory_->http_pipelined_host_pool_.IsKeyEligibleForPipelining(
       *http_pipelining_key_.get());
 }
 
 }  // namespace net