commit 95480b9512d75acd57621613a98f7fe6fce549ba
author fayang <fayang@google.com> Fri Jun 19 09:30:38 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Jun 19 10:34:15 2020 -0700
tree 588b383d785cbf265b20090091fa847f5fed66b3
parent 942a9f859ec029a43f1f4fde9252e173b6d64443

Fix a corner case where initial ack could be coalesced with other packet. protected by existing gfe2_reloadable_flag_quic_bundle_crypto_data_with_initial_ack.

PiperOrigin-RevId: 317322070
Change-Id: Ia2e4b79769c3fbb047d0929730ae4b9bfef5e446

quic/core/quic_connection.cc

diff --git a/quic/core/quic_connection.cc b/quic/core/quic_connection.cc
index b69edfe..27bb4c4 100644
--- a/quic/core/quic_connection.cc
+++ b/quic/core/quic_connection.cc
@@ -4248,6 +4248,11 @@
     // Not going to send initial ACK.
     return;
   }
+  if (coalesced_packet_.length() > 0) {
+    // Do not bundle CRYPTO data if the ACK could be coalesced with other
+    // packets.
+    return;
+  }
   // Initial ACK will be padded to full anyway, so try to bundle INITIAL crypto
   // data.
   sent_packet_manager_.RetransmitInitialDataIfAny();