commit 075735313c1c2fe9899d9e0aac252fa35b298365
author fayang <fayang@google.com> Mon Apr 06 13:20:17 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Mon Apr 06 13:20:51 2020 -0700
tree c8cb50d725e6d9bdbef0cc1ed9f5e3d9bd5592a6
parent 1ac7f0126e6755fe144eb9be3715d8b90f3b7681

gfe-relnote: Calling OnConfigNegotiated() after OverrideQuicConfigDefaults in tls_server_handshaker. No functional change expected. Protected by existing gfe2_reloadable_flag_quic_enable_version_draft_25_v3 and gfe2_reloadable_flag_quic_enable_version_draft_27.

PiperOrigin-RevId: 305103023
Change-Id: I136d6d233d93f95ca877e4633494ea0e0ad64882

quic/core/quic_session.h

diff --git a/quic/core/quic_session.h b/quic/core/quic_session.h
index ee8e512..c1986e2 100644
--- a/quic/core/quic_session.h
+++ b/quic/core/quic_session.h
@@ -453,14 +453,13 @@
 
   // Set the number of streams that the peer is allowed to open.
   void ConfigureMaxBidirectionalStreamsToSend(QuicStreamCount max_stream) {
+    DCHECK(VersionHasIetfQuicFrames(transport_version()));
     config_.SetMaxBidirectionalStreamsToSend(max_stream);
-    v99_streamid_manager_.SetMaxOpenIncomingBidirectionalStreams(max_stream);
   }
   void ConfigureMaxUnidirectionalStreamsToSend(QuicStreamCount max_stream) {
+    DCHECK(VersionHasIetfQuicFrames(transport_version()));
     config_.SetMaxUnidirectionalStreamsToSend(
         max_stream + num_expected_unidirectional_static_streams_);
-    v99_streamid_manager_.SetMaxOpenIncomingUnidirectionalStreams(
-        max_stream + num_expected_unidirectional_static_streams_);
   }
 
   // Returns the ALPN values to negotiate on this session.

quic/core/tls_server_handshaker.cc

diff --git a/quic/core/tls_server_handshaker.cc b/quic/core/tls_server_handshaker.cc
index ced2bd4..f4ce22b 100644
--- a/quic/core/tls_server_handshaker.cc
+++ b/quic/core/tls_server_handshaker.cc
@@ -251,7 +251,6 @@
   }
   ProcessAdditionalTransportParameters(client_params);
 
-  session()->OnConfigNegotiated();
   return true;
 }
 
@@ -412,6 +411,8 @@
     return SSL_TLSEXT_ERR_ALERT_FATAL;
   }
   OverrideQuicConfigDefaults(session()->config());
+  session()->OnConfigNegotiated();
+
   if (!SetTransportParameters()) {
     QUIC_LOG(ERROR) << "Failed to set transport parameters";
     return SSL_TLSEXT_ERR_ALERT_FATAL;