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 159 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 43 matching lines @@
 }
 
 bool SpdyHttpStream::OnSendHeadersComplete(int status) {
   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;
-  return stream_->WriteStreamData(request_body_stream_->buf(), buf_len,
-                                  spdy::DATA_FLAG_FIN);
+  bool is_chunked = request_body_stream_->is_chunked();
+  // TODO(satish): For non-chunked POST data, we set DATA_FLAG_FIN for all
+  // blocks of data written out. This is wrong if the POST data was larger than
+  // UploadDataStream::kBufSize as that is the largest buffer that
+  // UploadDataStream returns at a time and we'll be setting the FIN flag for
+  // each block of data written out.
+  bool eof = !is_chunked || request_body_stream_->peek_end_of_chunks();
+  return stream_->WriteStreamData(
+      request_body_stream_->buf(), buf_len,
+      eof ? spdy::DATA_FLAG_FIN : spdy::DATA_FLAG_NONE);
 }
 
-bool SpdyHttpStream::OnSendBodyComplete(int status) {
+int SpdyHttpStream::OnSendBodyComplete(int status, bool* eof) {

[willchan no longer on Chromium, 2011/03/03 19:47:48]

You should initialize *eof to false. Your comment in spdy_stream.h leaves this
state ambiguous. It's probably best to always set *eof. If *eof was already
true, then how can the user tell if this code also set it to true?

[Satish, 2011/03/03 22:21:44]

*eof is already initialized below in line 292, not to false but to the
stream->eof(). Or have I misunderstood?

[willchan no longer on Chromium, 2011/03/03 22:26:54]

Oops, I'm blind. 

   CHECK(request_body_stream_.get());
+
   request_body_stream_->MarkConsumedAndFillBuffer(status);
-  return request_body_stream_->eof();
+  *eof = request_body_stream_->eof();
+  if (!*eof &&
+      request_body_stream_->is_chunked() &&
+      !request_body_stream_->buf_len())
+    return ERR_IO_PENDING;
+
+  return OK;
 }
 
 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