Add chunked uploads support to SPDY

net/spdy/spdy_http_stream.cc

 // Copyright (c) 2010 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 <string>
 
@@ skipping 157 matching lines @@
 }
 
 bool SpdyHttpStream::IsConnectionReused() const {
   return spdy_session_->IsReused();
 }
 
 void SpdyHttpStream::SetConnectionReused() {
   // SPDY doesn't need an indicator here.
 }
 
+void SpdyHttpStream::set_chunk_callback(ChunkCallback* callback) {
+  if (request_body_stream_ != NULL)
+    request_body_stream_->set_chunk_callback(callback);
+}
+
 int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
                                 UploadDataStream* request_body,
                                 HttpResponseInfo* response,
                                 CompletionCallback* callback) {
   base::Time request_time = base::Time::Now();
   CHECK(stream_.get());
 
   stream_->SetDelegate(this);
 
   linked_ptr<spdy::SpdyHeaderBlock> headers(new spdy::SpdyHeaderBlock);
   CreateSpdyHeadersFromHttpRequest(*request_info_, request_headers,
                                    headers.get(), direct_);
   stream_->set_spdy_headers(headers);
 
   stream_->SetRequestTime(request_time);
   // This should only get called in the case of a request occurring
   // during server push that has already begun but hasn't finished,
   // so we set the response's request time to be the actual one
   if (response_info_)
     response_info_->request_time = request_time;
 
   CHECK(!request_body_stream_.get());
   if (request_body) {
-    if (request_body->size())
+    if (request_body->size() || request_body->is_chunked())
       request_body_stream_.reset(request_body);
     else
       delete request_body;
   }
 
   CHECK(callback);
   CHECK(!stream_->cancelled());
   CHECK(response);
 
   if (!stream_->pushed() && stream_->closed()) {
@@ skipping 39 matching lines @@
   if (user_callback_)
     DoCallback(status);
   return request_body_stream_.get() == NULL;
 }
 
 int SpdyHttpStream::OnSendBody() {
   CHECK(request_body_stream_.get());
   int buf_len = static_cast<int>(request_body_stream_->buf_len());
   if (!buf_len)
     return OK;
+  bool is_chunked = request_body_stream_->is_chunked();
   return stream_->WriteStreamData(request_body_stream_->buf(), buf_len,
-                                  spdy::DATA_FLAG_FIN);
+      is_chunked ? spdy::DATA_FLAG_NONE : spdy::DATA_FLAG_FIN);
 }
 
-bool SpdyHttpStream::OnSendBodyComplete(int status) {
+bool SpdyHttpStream::OnSendBodyComplete(int* status) {

[willchan no longer on Chromium, 2011/01/27 18:47:49]

You're reusing the same parameter for input and output. You probably shouldn't
be doing this. Why don't you just change the return value?

[Satish, 2011/01/27 20:42:09]

The function needs the status code as input and return 2 values - network status
code as well as EOF flag. So we either need 1 IN parameter (status), 1 OUT
parameter (eof) and a return value (write status), or 1 IN/OUT parameter and a
return value as I have done here. I'm fine either way, so I can change it to the
first if you prefer so.

[willchan no longer on Chromium, 2011/01/28 00:56:17]

OK, I see what's going on here. You should probably be changing
SpdyStream::DoSendBodyComplete() to go back to DoSendBody() if there is still
more data to be written. You should not be writting data here in
SpdyHttpStream::OnSendBodyComplete().

   CHECK(request_body_stream_.get());
-  request_body_stream_->MarkConsumedAndFillBuffer(status);
-  return request_body_stream_->eof();
+  request_body_stream_->MarkConsumedAndFillBuffer(*status);
+
+  bool is_chunked = request_body_stream_->is_chunked();
+  bool eof = request_body_stream_->eof();
+  if (is_chunked && eof) {
+    *status = stream_->WriteStreamData(request_body_stream_->buf(), 0,
+                                       spdy::DATA_FLAG_FIN);
+  } else {
+    *status = (!is_chunked || request_body_stream_->buf_len()) ?
+              OK : ERR_IO_PENDING;
+  }
+
+  return eof;
 }
 
 int SpdyHttpStream::OnResponseReceived(const spdy::SpdyHeaderBlock& response,
                                        base::Time response_time,
                                        int status) {
   if (!response_info_) {
     DCHECK(stream_->pushed());
     push_response_info_.reset(new HttpResponseInfo);
     response_info_ = push_response_info_.get();
   }
@@ skipping 148 matching lines @@
   stream_->GetSSLInfo(ssl_info, &using_npn);
 }
 
 void SpdyHttpStream::GetSSLCertRequestInfo(
     SSLCertRequestInfo* cert_request_info) {
   DCHECK(stream_);
   stream_->GetSSLCertRequestInfo(cert_request_info);
 }
 
 }  // namespace net