Landing Recent QUIC changes until 12/18/2015 13:57 UTC

net/quic/quic_spdy_stream.cc

 // Copyright 2013 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_spdy_stream.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "net/quic/quic_spdy_session.h"
 #include "net/quic/quic_utils.h"
@@ skipping 177 matching lines @@
   }
   if (FinishedReadingHeaders()) {
     sequencer()->SetUnblocked();
   }
 }
 
 void QuicSpdyStream::OnTrailingHeadersComplete(bool fin, size_t /*frame_len*/) {
   DCHECK(!trailers_decompressed_);
   if (fin_received()) {
     DLOG(ERROR) << "Received Trailers after FIN, on stream: " << id();
-    session()->CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA);
+    session()->CloseConnectionWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA,
+                                          "Trailers after fin");
     return;
   }
   if (!fin) {
     DLOG(ERROR) << "Trailers must have FIN set, on stream: " << id();
-    session()->CloseConnection(QUIC_INVALID_HEADERS_STREAM_DATA);
+    session()->CloseConnectionWithDetails(QUIC_INVALID_HEADERS_STREAM_DATA,
+                                          "Fin missing from trailers");
     return;
   }
   trailers_decompressed_ = true;
 }
 
 void QuicSpdyStream::OnStreamReset(const QuicRstStreamFrame& frame) {
   if (frame.error_code != QUIC_STREAM_NO_ERROR ||
       version() <= QUIC_VERSION_28) {
     ReliableQuicStream::OnStreamReset(frame);
     return;
@@ skipping 25 matching lines @@
   if (!FLAGS_quic_supports_trailers) {
     return true;
   }
   // If no further trailing headers are expected, and the decompressed trailers
   // (if any) have been consumed, then reading of trailers is finished.
   bool no_more_trailers = fin_received() || trailers_decompressed_;
   return no_more_trailers && decompressed_trailers_.empty();
 }
 
 }  // namespace net