QUIC - use QuicSessionKey tuple (host, port, is_https) instead of server_hostname

net/quic/quic_stream_factory.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/quic/quic_stream_factory.h"
 
 #include <set>
 
 #include "base/message_loop/message_loop.h"
 #include "base/message_loop/message_loop_proxy.h"
@@ skipping 659 matching lines @@
         http_server_properties_->GetServerNetworkStats(host_port_pair);
     if (stats != NULL) {
       config.set_initial_round_trip_time_us(stats->rtt.InMicroseconds(),
                                             stats->rtt.InMicroseconds());
     }
   }
 
   *session = new QuicClientSession(
       connection, socket.Pass(), writer.Pass(), this,
       quic_crypto_client_stream_factory_, host_port_pair.host(),
-      config, crypto_config, net_log.net_log());
+      host_port_pair.port(), config, crypto_config, net_log.net_log());
   all_sessions_.insert(*session);  // owning pointer
   if (is_https) {
     crypto_config->SetProofVerifier(
         new ProofVerifierChromium(cert_verifier, net_log));
   }
   return OK;
 }
 
 bool QuicStreamFactory::HasActiveJob(const SessionKey& key) const {
   return ContainsKey(active_jobs_, key);
@@ skipping 18 matching lines @@
   if (ContainsKey(all_crypto_configs_, session_key)) {
     crypto_config = all_crypto_configs_[session_key];
     DCHECK(crypto_config);
   } else {
     // TODO(rtenneti): if two quic_sessions for the same host_port_pair
     // share the same crypto_config, will it cause issues?
     crypto_config = new QuicCryptoClientConfig();
     if (quic_server_info_factory_) {
       QuicCryptoClientConfig::CachedState* cached =
           crypto_config->Create(session_key.host_port_pair.host(),
+                                session_key.host_port_pair.port(),
                                 quic_server_info_factory_);
       DCHECK(cached);
     }
     crypto_config->SetDefaults();
     all_crypto_configs_[session_key] = crypto_config;
     PopulateFromCanonicalConfig(session_key, crypto_config);
   }
   return crypto_config;
 }
 
@@ skipping 25 matching lines @@
       canonical_hostname_to_origin_map_[suffix_session_key];
   QuicCryptoClientConfig* canonical_crypto_config =
       all_crypto_configs_[canonical_session_key];
   DCHECK(canonical_crypto_config);
   const HostPortPair& canonical_host_port_pair =
       canonical_session_key.host_port_pair;
 
   // Copy the CachedState for the canonical server from canonical_crypto_config
   // as the initial CachedState for the server_hostname in crypto_config.
   crypto_config->InitializeFrom(server_hostname,
+                                server_port,
                                 canonical_host_port_pair.host(),
+                                canonical_host_port_pair.port(),
                                 canonical_crypto_config);
   // Update canonical version to point at the "most recent" crypto_config.
   canonical_hostname_to_origin_map_[suffix_session_key] =
       canonical_session_key;
 }
 
 }  // namespace net