Land Recent QUIC Changes

net/quic/reliable_quic_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/quic/reliable_quic_stream.h"
 
 #include "net/quic/quic_session.h"
 
 using base::StringPiece;
 
@@ skipping 48 matching lines @@
 
   return accepted;
 }
 
 void ReliableQuicStream::OnStreamReset(QuicRstStreamErrorCode error) {
   stream_error_ = error;
   TerminateFromPeer(false);  // Full close.
 }
 
 void ReliableQuicStream::ConnectionClose(QuicErrorCode error, bool from_peer) {
+  if (IsClosed()) {
+    return;
+  }
   if (error != QUIC_NO_ERROR) {
     stream_error_ = QUIC_STREAM_CONNECTION_ERROR;
     connection_error_ = error;
   }
 
   if (from_peer) {
     TerminateFromPeer(false);
   } else {
     CloseWriteSide();
     CloseReadSide();
   }
 }
 
 void ReliableQuicStream::TerminateFromPeer(bool half_close) {
   if (!half_close) {
     CloseWriteSide();
   }
   CloseReadSide();
 }
 
 void ReliableQuicStream::Close(QuicRstStreamErrorCode error) {
   stream_error_ = error;
   session()->SendRstStream(id(), error);
 }
 
 bool ReliableQuicStream::IsHalfClosed() const {
   return sequencer_.IsHalfClosed();
 }
 
+bool ReliableQuicStream::IsClosed() const {
+  return write_side_closed_ && (read_side_closed_ || IsHalfClosed());
+}
+
 bool ReliableQuicStream::HasBytesToRead() const {
   return sequencer_.HasBytesToRead();
 }
 
 const IPEndPoint& ReliableQuicStream::GetPeerAddress() const {
   return session_->peer_address();
 }
 
 QuicConsumedData ReliableQuicStream::WriteData(StringPiece data, bool fin) {
   return WriteOrBuffer(data, fin);
@@ skipping 80 matching lines @@
   DLOG(INFO) << "Done writing to stream " << id();
 
   write_side_closed_ = true;
   if (read_side_closed_) {
     DLOG(INFO) << "Closing stream: " << id();
     session_->CloseStream(id());
   }
 }
 
 void ReliableQuicStream::OnClose() {
+  CloseReadSide();
+  CloseWriteSide();
+
   if (visitor_) {
     Visitor* visitor = visitor_;
     // Calling Visitor::OnClose() may result the destruction of the visitor,
     // so we need to ensure we don't call it again.
     visitor_ = NULL;
     visitor->OnClose(this);
   }
 }
 
 }  // namespace net