Add chunked uploads support to SPDY

net/spdy/spdy_http_stream.cc

Index: net/spdy/spdy_http_stream.cc
diff --git a/net/spdy/spdy_http_stream.cc b/net/spdy/spdy_http_stream.cc
index 6a6abb241f84a1bd83a07c0d3ae822a3a1ffdae4..cb4661f2496ad31ec1df770e6e322f75187317d6 100644
--- a/net/spdy/spdy_http_stream.cc
+++ b/net/spdy/spdy_http_stream.cc
@@ -175,6 +175,11 @@ 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,
@@ -198,7 +203,7 @@ int SpdyHttpStream::SendRequest(const HttpRequestHeaders& request_headers,
 
   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;
@@ -258,14 +263,26 @@ int SpdyHttpStream::OnSendBody() {
   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,