Introduce error handling in SpdyHttpStream on UploadDataStream::Read() failure.

net/spdy/spdy_http_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/spdy/spdy_http_stream.h"
 
 #include <algorithm>
 #include <list>
 #include <utility>
 
@@ skipping 284 matching lines @@
 void SpdyHttpStream::Cancel() {
   request_callback_.Reset();
   response_callback_.Reset();
   if (stream_.get()) {
     stream_->Cancel();
     DCHECK(!stream_.get());
   }
 }
 
 void SpdyHttpStream::OnRequestHeadersSent() {
+  // TODO(akalin): Do this immediately after sending the request
+  // headers.
+  if (HasUploadData()) {
+    ReadAndSendRequestBodyData();
+    return;
+  }
+
   if (!request_callback_.is_null())
     DoRequestCallback(OK);
-
-  // TODO(akalin): Do this immediately after sending the request
-  // headers.
-  if (HasUploadData())
-    ReadAndSendRequestBodyData();
 }
 
 SpdyResponseHeadersStatus SpdyHttpStream::OnResponseHeadersUpdated(
     const SpdyHeaderBlock& response_headers) {
   CHECK_EQ(response_headers_status_, RESPONSE_HEADERS_ARE_INCOMPLETE);
 
   if (!response_info_) {
     DCHECK_EQ(stream_->type(), SPDY_PUSH_STREAM);
     push_response_info_.reset(new HttpResponseInfo);
     response_info_ = push_response_info_.get();
@@ skipping 119 matching lines @@
     return;
 
   // Read the data from the request body stream.
   const int rv = request_info_->upload_data_stream
       ->Read(request_body_buf_.get(),
              request_body_buf_->size(),
              base::Bind(&SpdyHttpStream::OnRequestBodyReadCompleted,
                         weak_factory_.GetWeakPtr()));
 
   if (rv != ERR_IO_PENDING) {
-    // ERR_IO_PENDING is the only possible error.
-    CHECK_GE(rv, 0);
+    // UploadDataStream::Read() can fail reading data
     OnRequestBodyReadCompleted(rv);
   }
 }
 
+void SpdyHttpStream::ResetStreamInternal() {
+  spdy_session_->ResetStream(stream()->stream_id(), RST_STREAM_INTERNAL_ERROR,
+                             std::string());
+}
+
 void SpdyHttpStream::OnRequestBodyReadCompleted(int status) {
-  CHECK_GE(status, 0);
-  request_body_buf_size_ = status;
-  const bool eof = request_info_->upload_data_stream->IsEOF();
-  // Only the final fame may have a length of 0.
-  if (eof) {
-    CHECK_GE(request_body_buf_size_, 0);
+  if (status < 0) {
+    DCHECK_NE(ERR_IO_PENDING, status);
+
+    base::ThreadTaskRunnerHandle::Get()->PostTask(
+        FROM_HERE, base::Bind(&SpdyHttpStream::ResetStreamInternal,
+                              weak_factory_.GetWeakPtr()));
   } else {
-    CHECK_GT(request_body_buf_size_, 0);
+    CHECK_GE(status, 0);
+    request_body_buf_size_ = status;
+    const bool eof = request_info_->upload_data_stream->IsEOF();
+    // Only the final fame may have a length of 0.
+    if (eof) {
+      CHECK_GE(request_body_buf_size_, 0);
+    } else {
+      CHECK_GT(request_body_buf_size_, 0);
+    }
+    stream_->SendData(request_body_buf_.get(), request_body_buf_size_,
+                      eof ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
   }
-  stream_->SendData(request_body_buf_.get(),
-                    request_body_buf_size_,
-                    eof ? NO_MORE_DATA_TO_SEND : MORE_DATA_TO_SEND);
+
+  if (!request_callback_.is_null()) {
+    int result = status > 0 ? OK : status;
+    DoRequestCallback(result);
+  }
 }
 
 void SpdyHttpStream::ScheduleBufferedReadCallback() {
   // If there is already a scheduled DoBufferedReadCallback, don't issue
   // another one.  Mark that we have received more data and return.
   if (buffered_read_callback_pending_) {
     more_read_data_pending_ = true;
     return;
   }
 
@@ skipping 104 matching lines @@
   details->connection_info = HttpResponseInfo::CONNECTION_INFO_HTTP2;
   return;
 }
 
 void SpdyHttpStream::SetPriority(RequestPriority priority) {
   // TODO(akalin): Plumb this through to |stream_request_| and
   // |stream_|.
 }
 
 }  // namespace net