Land Recent QUIC changes

net/tools/quic/quic_spdy_server_stream.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/tools/quic/quic_spdy_server_stream.h"
 
 #include "net/quic/quic_session.h"
 #include "net/spdy/spdy_framer.h"
 #include "net/tools/quic/spdy_utils.h"
 
@@ skipping 32 matching lines @@
   }
   return length;
 }
 
 void QuicSpdyServerStream::TerminateFromPeer(bool half_close) {
   ReliableQuicStream::TerminateFromPeer(half_close);
   // This is a full close: do not send a response.
   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() ==
              BalsaHeadersEnums::VALID_CONTENT_LENGTH) &&
              mutable_body()->size() != headers().content_length()) {
     SendErrorResponse();  // Invalid content length
   } else {
     SendResponse();
   }
 }
@@ skipping 28 matching lines @@
   if (delta > 0) {
     mutable_body()->append(data + len, delta);
   }
 
   request_headers_received_ = true;
   return len;
 }
 
 }  // namespace tools
 }  // namespace net