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

net/quic/quic_spdy_stream.cc

Index: net/quic/quic_spdy_stream.cc
diff --git a/net/quic/quic_spdy_stream.cc b/net/quic/quic_spdy_stream.cc
index a3f2fb0b41e690bc3adf1c7f4bf64b441f3e69bd..4f9677738a5a18f5ea843d466f165d9ab3477f76 100644
--- a/net/quic/quic_spdy_stream.cc
+++ b/net/quic/quic_spdy_stream.cc
@@ -195,12 +195,14 @@ 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;