Landing Recent QUIC changes until 5:30 PM, Feb 3, 2017 UTC-5

net/quic/core/quic_spdy_session.cc

 // Copyright (c) 2015 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/core/quic_spdy_session.h"
 
 #include <algorithm>
 #include <cstdint>
 #include <string>
 #include <utility>
@@ skipping 553 matching lines @@
                                 ConnectionCloseBehavior::SILENT_CLOSE);
 }
 
 void QuicSpdySession::OnConfigNegotiated() {
   QuicSession::OnConfigNegotiated();
   if (config()->HasClientSentConnectionOption(kDHDT, perspective())) {
     DisableHpackDynamicTable();
   }
   const QuicVersion version = connection()->version();
   if (FLAGS_quic_reloadable_flag_quic_enable_force_hol_blocking &&
-      version > QUIC_VERSION_35 && config()->ForceHolBlocking(perspective())) {
+      version == QUIC_VERSION_36 && config()->ForceHolBlocking(perspective())) {
     force_hol_blocking_ = true;
     // Since all streams are tunneled through the headers stream, it
     // is important that headers stream never flow control blocks.
     // Otherwise, busy-loop behaviour can ensue where data streams
     // data try repeatedly to write data not realizing that the
     // tunnel through the headers stream is blocked.
     headers_stream_->flow_controller()->UpdateReceiveWindowSize(
         kStreamReceiveWindowLimit);
     headers_stream_->flow_controller()->UpdateSendWindowOffset(
         kStreamReceiveWindowLimit);
@@ skipping 158 matching lines @@
       set_max_uncompressed_header_bytes);
 }
 
 void QuicSpdySession::CloseConnectionWithDetails(QuicErrorCode error,
                                                  const string& details) {
   connection()->CloseConnection(
       error, details, ConnectionCloseBehavior::SEND_CONNECTION_CLOSE_PACKET);
 }
 
 }  // namespace net