Land Recent QUIC changes

net/tools/quic/quic_spdy_server_stream.cc

Index: net/tools/quic/quic_spdy_server_stream.cc
diff --git a/net/tools/quic/quic_spdy_server_stream.cc b/net/tools/quic/quic_spdy_server_stream.cc
index 94afaa0aad482ea7519d8aba999d4f2b22b52bed..ac537a8d2944374fc275b8627d9eca5e51c0fcad 100644
--- a/net/tools/quic/quic_spdy_server_stream.cc
+++ b/net/tools/quic/quic_spdy_server_stream.cc
@@ -50,6 +50,10 @@ void QuicSpdyServerStream::TerminateFromPeer(bool half_close) {
   if (!half_close) {
     return;
   }
+  if (write_side_closed() || fin_buffered()) {
+    return;
+  }
+
   if (!request_headers_received_) {
     SendErrorResponse();  // We're not done writing headers.
   } else if ((headers().content_length_status() ==