Prototype of chunked transfer encoded POST.

net/base/upload_data_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/base/upload_data_stream.h"
 
 #include "base/file_util.h"
 #include "base/logging.h"
 #include "net/base/file_stream.h"
 #include "net/base/io_buffer.h"
 #include "net/base/net_errors.h"
 
 namespace net {
 
 UploadDataStream* UploadDataStream::Create(UploadData* data, int* error_code) {
   scoped_ptr<UploadDataStream> stream(new UploadDataStream(data));
   int rv = stream->FillBuf();
   if (error_code)
     *error_code = rv;
   if (rv != OK)
     return NULL;
 
   return stream.release();
 }
 
 UploadDataStream::UploadDataStream(UploadData* data)
     : data_(data),
       buf_(new IOBuffer(kBufSize)),
       buf_len_(0),
-      next_element_(data->elements()->begin()),
+      next_element_(0),
       next_element_offset_(0),
       next_element_remaining_(0),
-      total_size_(data->GetContentLength()),
+      total_size_(data->is_chunked() ? 0 : data->GetContentLength()),
       current_position_(0),
       eof_(false) {
+  if (data_->is_chunked())
+    data_->set_chunk_callback(this);
 }
 
 UploadDataStream::~UploadDataStream() {
 }
 
 void UploadDataStream::DidConsume(size_t num_bytes) {
   DCHECK_LE(num_bytes, buf_len_);
   DCHECK(!eof_);
 
   buf_len_ -= num_bytes;
   if (buf_len_)
     memmove(buf_->data(), buf_->data() + num_bytes, buf_len_);
 
   FillBuf();
 
   current_position_ += num_bytes;
 }
 
+void UploadDataStream::set_chunk_callback(ChunkCallback* callback) {
+  chunk_callback_ = callback;
+}
+
+void UploadDataStream::OnChunkAvailable() {
+  FillBuf();
+  if (chunk_callback_)
+    chunk_callback_->OnChunkAvailable();
+}
+
 int UploadDataStream::FillBuf() {
-  std::vector<UploadData::Element>::iterator end =
-      data_->elements()->end();
+  std::vector<UploadData::Element>& elements = *data_->elements();
+  if (elements.size() == 0 && data_->is_chunked()) {
+    // We are waiting for data from UploadData, so nothing to do.
+    return OK;
+  }

[wtc, 2011/01/20 00:29:47]

I believe we can remove lines 68-71, if we make the change
I suggested to line 149 below.

 
-  while (buf_len_ < kBufSize && next_element_ != end) {
+  while (buf_len_ < kBufSize && next_element_ < elements.size()) {
     bool advance_to_next_element = false;
 
-    UploadData::Element& element = *next_element_;
+    UploadData::Element& element = elements[next_element_];
 
     size_t size_remaining = kBufSize - buf_len_;
-    if (element.type() == UploadData::TYPE_BYTES) {
+    if (element.type() == UploadData::TYPE_BYTES ||
+        element.type() == UploadData::TYPE_CHUNK) {
       const std::vector<char>& d = element.bytes();
       size_t count = d.size() - next_element_offset_;
 
       size_t bytes_copied = std::min(count, size_remaining);
 
-      memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied);
+      if (bytes_copied > 0)

[vandebo (ex-Chrome), 2011/01/18 21:51:17]

note: encoding end of chunks with a single element would mean you don't need
this addition.

[wtc, 2011/01/20 00:29:47]

memcpy should be able to copy 0 bytes.

[vandebo (ex-Chrome), 2011/01/20 20:48:45]

As I recall, it does cause problems on some platforms though.

+        memcpy(buf_->data() + buf_len_, &d[next_element_offset_], bytes_copied);
       buf_len_ += bytes_copied;
 
       if (bytes_copied == count) {
         advance_to_next_element = true;
       } else {
         next_element_offset_ += bytes_copied;
       }
     } else {
       DCHECK(element.type() == UploadData::TYPE_FILE);
 
@@ skipping 38 matching lines @@
     }
 
     if (advance_to_next_element) {
       ++next_element_;
       next_element_offset_ = 0;
       next_element_remaining_ = 0;
       next_element_stream_.reset();
     }
   }
 
-  if (next_element_ == end && !buf_len_)
-    eof_ = true;
+  if (next_element_ == elements.size() && !buf_len_) {
+    // If this is a chunked-transfer encoded stream, the last element should

[wtc, 2011/01/20 00:29:47]

Nit: chunked-transfer => chunked transfer

+    // have an empty bytes array to indicate the end of stream.
+    if (!data_->is_chunked() || elements.back().bytes().size() == 0)

[wtc, 2011/01/20 00:29:47]

This should read:
    if (!data_->is_chunked() ||
        (!elements.empty() && elements.back().bytes().empty())) {
      eof_ = true;
    }

+      eof_ = true;
+  }
 
   return OK;
 }
 
 }  // namespace net