Landing Recent QUIC changes until 2016-03-15 16:26 UTC

net/quic/quic_session.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_session.h"
 
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/quic/crypto/proof_verifier.h"
@@ skipping 166 matching lines @@
       num_writes += 1;
     }
     if (write_blocked_streams_.headers_stream_blocked()) {
       num_writes += 1;
     }
   }
   if (num_writes == 0) {
     return;
   }
 
-  QuicConnection::ScopedPacketBundler ack_bundler(connection_.get(),
-                                                  QuicConnection::NO_ACK);
+  QuicConnection::ScopedPacketBundler ack_bundler(
+      connection_.get(), QuicConnection::SEND_ACK_IF_QUEUED);
   for (size_t i = 0; i < num_writes; ++i) {
     if (!(write_blocked_streams_.HasWriteBlockedCryptoOrHeadersStream() ||
           write_blocked_streams_.HasWriteBlockedDataStreams())) {
       // Writing one stream removed another!? Something's broken.
       QUIC_BUG << "WriteBlockedStream is missing";
       connection_->CloseConnection(QUIC_INTERNAL_ERROR,
                                    ConnectionCloseSource::FROM_SELF);
       return;
     }
     if (!connection_->CanWriteStreamData()) {
@@ skipping 602 matching lines @@
 
 size_t QuicSession::MaxAvailableStreams() const {
   return max_open_incoming_streams_ * kMaxAvailableStreamsMultiplier;
 }
 
 bool QuicSession::IsIncomingStream(QuicStreamId id) const {
   return id % 2 != next_outgoing_stream_id_ % 2;
 }
 
 }  // namespace net