Landing recent QUIC changes until Sun Mar 5 09:18:09 2017 +0000

net/tools/quic/quic_spdy_server_stream_base.cc

Index: net/tools/quic/quic_spdy_server_stream_base.cc
diff --git a/net/tools/quic/quic_spdy_server_stream_base.cc b/net/tools/quic/quic_spdy_server_stream_base.cc
index e84516899b5be4a0272b602ed52471b93a14a8a4..f7af8734b511c350e49defccad0640aa526d1766 100644
--- a/net/tools/quic/quic_spdy_server_stream_base.cc
+++ b/net/tools/quic/quic_spdy_server_stream_base.cc
@@ -20,11 +20,22 @@ void QuicSpdyServerStreamBase::CloseWriteSide() {
     // or RST.
     DCHECK(fin_sent());
     // Tell the peer to stop sending further data.
-    QUIC_DVLOG(0) << " Server: Send QUIC_STREAM_NO_ERROR on stream " << id();
+    QUIC_DVLOG(1) << " Server: Send QUIC_STREAM_NO_ERROR on stream " << id();
     Reset(QUIC_STREAM_NO_ERROR);
   }
 
   QuicSpdyStream::CloseWriteSide();
 }
 
+void QuicSpdyServerStreamBase::StopReading() {
+  if (!fin_received() && !rst_received() && write_side_closed() &&
+      !rst_sent()) {
+    DCHECK(fin_sent());
+    // Tell the peer to stop sending further data.
+    QUIC_DVLOG(1) << " Server: Send QUIC_STREAM_NO_ERROR on stream " << id();
+    Reset(QUIC_STREAM_NO_ERROR);
+  }
+  QuicSpdyStream::StopReading();
+}
+
 }  // namespace net