Landing Recent QUIC changes until 4/8/2016 17:17 UTC

net/tools/quic/quic_server_session_base.cc

Index: net/tools/quic/quic_server_session_base.cc
diff --git a/net/tools/quic/quic_server_session_base.cc b/net/tools/quic/quic_server_session_base.cc
index e2341906bdf04c12279a7b3e9e3ca59dbea43e9c..2f2c4d1a7b74e58ca0fd3341386eadb3fbcd3a03 100644
--- a/net/tools/quic/quic_server_session_base.cc
+++ b/net/tools/quic/quic_server_session_base.cc
@@ -29,7 +29,8 @@ QuicServerSessionBase::QuicServerSessionBase(
       bandwidth_resumption_enabled_(false),
       bandwidth_estimate_sent_to_client_(QuicBandwidth::Zero()),
       last_scup_time_(QuicTime::Zero()),
-      last_scup_packet_number_(0) {}
+      last_scup_packet_number_(0),
+      server_push_enabled_(false) {}
 
 QuicServerSessionBase::~QuicServerSessionBase() {}
 
@@ -53,6 +54,8 @@ void QuicServerSessionBase::OnConfigNegotiated() {
       ContainsQuicTag(config()->ReceivedConnectionOptions(), kBWMX);
   bandwidth_resumption_enabled_ =
       last_bandwidth_resumption || max_bandwidth_resumption;
+  server_push_enabled_ =
+      ContainsQuicTag(config()->ReceivedConnectionOptions(), kSPSH);
 
   // If the client has provided a bandwidth estimate from the same serving
   // region as this server, then decide whether to use the data for bandwidth
@@ -61,9 +64,9 @@ void QuicServerSessionBase::OnConfigNegotiated() {
       crypto_stream_->PreviousCachedNetworkParams();
   if (cached_network_params != nullptr &&
       cached_network_params->serving_region() == serving_region_) {
-    if (FLAGS_quic_log_received_parameters) {
-      connection()->OnReceiveConnectionState(*cached_network_params);
-    }
+    // Log the received connection parameters, regardless of how they
+    // get used for bandwidth resumption.
+    connection()->OnReceiveConnectionState(*cached_network_params);
 
     if (bandwidth_resumption_enabled_) {
       // Only do bandwidth resumption if estimate is recent enough.