Make net::BidirectionalStream handle RST_STREAM_NO_ERROR

net/spdy/bidirectional_stream_spdy_impl.cc

 // Copyright 2015 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/spdy/bidirectional_stream_spdy_impl.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/time/time.h"
@@ skipping 90 matching lines @@
   read_buffer_ = buf;
   read_buffer_len_ = buf_len;
   return ERR_IO_PENDING;
 }
 
 void BidirectionalStreamSpdyImpl::SendData(const scoped_refptr<IOBuffer>& data,
                                            int length,
                                            bool end_stream) {
   DCHECK(length > 0 || (length == 0 && end_stream));
 
-  if (!stream_) {
-    LOG(ERROR) << "Trying to send data after stream has been destroyed.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&BidirectionalStreamSpdyImpl::NotifyError,
-                              weak_factory_.GetWeakPtr(), ERR_UNEXPECTED));
+  if (MaybeHandleStreamClosedInSendData())
     return;
-  }
 
   DCHECK(!stream_closed_);
   stream_->SendData(data.get(), length,
                     end_stream ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
 }
 
 void BidirectionalStreamSpdyImpl::SendvData(
     const std::vector<scoped_refptr<IOBuffer>>& buffers,
     const std::vector<int>& lengths,
     bool end_stream) {
   DCHECK_EQ(buffers.size(), lengths.size());
 
-  if (!stream_) {
-    LOG(ERROR) << "Trying to send data after stream has been destroyed.";
-    base::ThreadTaskRunnerHandle::Get()->PostTask(
-        FROM_HERE, base::Bind(&BidirectionalStreamSpdyImpl::NotifyError,
-                              weak_factory_.GetWeakPtr(), ERR_UNEXPECTED));
+  if (MaybeHandleStreamClosedInSendData())
     return;
-  }
 
   DCHECK(!stream_closed_);
   int total_len = 0;
   for (int len : lengths) {
     total_len += len;
   }
 
   pending_combined_buffer_ = new net::IOBuffer(total_len);
   int len = 0;
   // TODO(xunjieli): Get rid of extra copy. Coalesce headers and data frames.
@@ skipping 160 matching lines @@
   if (delegate_) {
     BidirectionalStreamImpl::Delegate* delegate = delegate_;
     delegate_ = nullptr;
     // Cancel any pending callback.
     weak_factory_.InvalidateWeakPtrs();
     delegate->OnFailed(rv);
     // |this| can be null when returned from delegate.
   }
 }
 
+void BidirectionalStreamSpdyImpl::NotifyDataSent() {
+  if (delegate_)
+    delegate_->OnDataSent();
+}
+
 void BidirectionalStreamSpdyImpl::ResetStream() {
   if (!stream_)
     return;
   if (!stream_->IsClosed()) {
     // This sends a RST to the remote.
     stream_->DetachDelegate();
     DCHECK(!stream_);
   } else {
     // Stream is already closed, so it is not legal to call DetachDelegate.
     stream_.reset();
@@ skipping 39 matching lines @@
 }
 
 bool BidirectionalStreamSpdyImpl::ShouldWaitForMoreBufferedData() const {
   if (stream_closed_)
     return false;
   DCHECK_GT(read_buffer_len_, 0);
   return read_data_queue_.GetTotalSize() <
          static_cast<size_t>(read_buffer_len_);
 }
 
+bool BidirectionalStreamSpdyImpl::MaybeHandleStreamClosedInSendData() {
+  if (stream_)
+    return false;
+  // If |stream_| is closed without an error, blackhole any any write data.
+  if (stream_closed_ && closed_stream_status_ == OK) {

[kapishnikov, 2016/10/28 16:11:00]

If the stream was closed because all data were sent & received, what will happen
if the client calls SendData()? Previously we were returning an error. As the
result of the change, will it blackhole the data now & call the delegate's
OnDataSent()?

+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::Bind(&BidirectionalStreamSpdyImpl::NotifyDataSent,
+                              weak_factory_.GetWeakPtr()));
+    return true;
+  }
+  LOG(ERROR) << "Trying to send data after stream has been destroyed.";
+  base::ThreadTaskRunnerHandle::Get()->PostTask(
+      FROM_HERE, base::Bind(&BidirectionalStreamSpdyImpl::NotifyError,
+                            weak_factory_.GetWeakPtr(), ERR_UNEXPECTED));
+  return true;
+}
+
 }  // namespace net