Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(130)

Unified Diff: net/base/upload_data.cc

Issue 6134003: Prototype of chunked transfer encoded POST. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: net/base/upload_data.cc
diff --git a/net/base/upload_data.cc b/net/base/upload_data.cc
index 664285dca6b3b7b874a93ba1f1798ec87b91ff28..f148cac142a7fec5fa17de062accebe3b6e0625b 100644
--- a/net/base/upload_data.cc
+++ b/net/base/upload_data.cc
@@ -6,6 +6,7 @@
#include "base/file_util.h"
#include "base/logging.h"
+#include "base/string_util.h"
#include "net/base/file_stream.h"
#include "net/base/net_errors.h"
@@ -15,6 +16,7 @@ UploadData::Element::Element()
: type_(TYPE_BYTES),
file_range_offset_(0),
file_range_length_(kuint64max),
+ is_last_chunk_(false),
override_content_length_(false),
content_length_computed_(false),
content_length_(-1),
@@ -30,7 +32,7 @@ uint64 UploadData::Element::GetContentLength() {
if (override_content_length_ || content_length_computed_)
return content_length_;
- if (type_ == TYPE_BYTES)
+ if (type_ == TYPE_BYTES || type_ == TYPE_CHUNK)
return static_cast<uint64>(bytes_.size());
else if (type_ == TYPE_BLOB)
// The blob reference will be resolved later.
@@ -65,6 +67,18 @@ uint64 UploadData::Element::GetContentLength() {
return content_length_;
}
+void UploadData::Element::SetToChunk(const char* bytes, int bytes_len) {
+ std::string chunk_length = StringPrintf("%X\r\n", bytes_len);
+ bytes_.clear();
+ bytes_.insert(bytes_.end(), chunk_length.data(),
+ chunk_length.data() + chunk_length.length());
+ bytes_.insert(bytes_.end(), bytes, bytes + bytes_len);
+ const char* crlf = "\r\n";
+ bytes_.insert(bytes_.end(), crlf, crlf + 2);
+ type_ = TYPE_CHUNK;
+ is_last_chunk_ = (bytes_len == 0);
+}
+
FileStream* UploadData::Element::NewFileStreamForReading() {
// In common usage GetContentLength() will call this first and store the
// result into |file_| and a subsequent call (from UploadDataStream) will
@@ -97,10 +111,14 @@ FileStream* UploadData::Element::NewFileStreamForReading() {
return file.release();
}
-UploadData::UploadData() : identifier_(0) {
+UploadData::UploadData()
+ : identifier_(0),
+ chunk_callback_(NULL),
+ is_chunked_(false) {
}
void UploadData::AppendBytes(const char* bytes, int bytes_len) {
+ DCHECK(!is_chunked_);
if (bytes_len > 0) {
elements_.push_back(Element());
elements_.back().SetToBytes(bytes, bytes_len);
@@ -108,6 +126,7 @@ void UploadData::AppendBytes(const char* bytes, int bytes_len) {
}
void UploadData::AppendFile(const FilePath& file_path) {
+ DCHECK(!is_chunked_);
elements_.push_back(Element());
elements_.back().SetToFilePath(file_path);
}
@@ -115,17 +134,32 @@ void UploadData::AppendFile(const FilePath& file_path) {
void UploadData::AppendFileRange(const FilePath& file_path,
uint64 offset, uint64 length,
const base::Time& expected_modification_time) {
+ DCHECK(!is_chunked_);
elements_.push_back(Element());
elements_.back().SetToFilePathRange(file_path, offset, length,
expected_modification_time);
}
void UploadData::AppendBlob(const GURL& blob_url) {
+ DCHECK(!is_chunked_);
elements_.push_back(Element());
elements_.back().SetToBlobUrl(blob_url);
}
+void UploadData::AppendChunk(const char* bytes, int bytes_len) {
+ DCHECK(is_chunked_);
+ elements_.push_back(Element());
+ elements_.back().SetToChunk(bytes, bytes_len);
+ if (chunk_callback_)
+ chunk_callback_->OnChunkAvailable();
+}
+
+void UploadData::set_chunk_callback(ChunkCallback* callback) {
+ chunk_callback_ = callback;
+}
+
uint64 UploadData::GetContentLength() {
+ DCHECK(!is_chunked_);
uint64 len = 0;
std::vector<Element>::iterator it = elements_.begin();
for (; it != elements_.end(); ++it)

Powered by Google App Engine
This is Rietveld 408576698