summaryrefslogtreecommitdiffstats
path: root/net/url_request
diff options
context:
space:
mode:
authorsatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 08:58:37 +0000
committersatish@chromium.org <satish@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-04 08:58:37 +0000
commit66ca8387165faa63b999b3d3080626cb4d8388b5 (patch)
treef3f33773a2c2a7814e54297eb30bb62e9fc65355 /net/url_request
parent02c89fbf01c7c7decffcb109220a400863798f0f (diff)
downloadchromium_src-66ca8387165faa63b999b3d3080626cb4d8388b5.zip
chromium_src-66ca8387165faa63b999b3d3080626cb4d8388b5.tar.gz
chromium_src-66ca8387165faa63b999b3d3080626cb4d8388b5.tar.bz2
Revert "Add chunked uploads support to SPDY"
This reverts commit 8431a6e7be70b1b50b0d5b851bbe728b7fef220f. TBR=satish git-svn-id: svn://svn.chromium.org/chrome/trunk/src@76896 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/url_request')
-rw-r--r--net/url_request/url_request.cc12
-rw-r--r--net/url_request/url_request.h7
-rw-r--r--net/url_request/url_request_unittest.cc13
3 files changed, 19 insertions, 13 deletions
diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc
index 5af99ea..e25bac6 100644
--- a/net/url_request/url_request.cc
+++ b/net/url_request/url_request.cc
@@ -184,13 +184,17 @@ void URLRequest::EnableChunkedUpload() {
}
}
-void URLRequest::AppendChunkToUpload(const char* bytes,
- int bytes_len,
- bool is_last_chunk) {
+void URLRequest::AppendChunkToUpload(const char* bytes, int bytes_len) {
DCHECK(upload_);
DCHECK(upload_->is_chunked());
DCHECK_GT(bytes_len, 0);
- upload_->AppendChunk(bytes, bytes_len, is_last_chunk);
+ upload_->AppendChunk(bytes, bytes_len);
+}
+
+void URLRequest::MarkEndOfChunks() {
+ DCHECK(upload_);
+ DCHECK(upload_->is_chunked());
+ upload_->AppendChunk(NULL, 0);
}
void URLRequest::set_upload(net::UploadData* upload) {
diff --git a/net/url_request/url_request.h b/net/url_request/url_request.h
index 849a03b..a2ad24b 100644
--- a/net/url_request/url_request.h
+++ b/net/url_request/url_request.h
@@ -330,9 +330,10 @@ class URLRequest : public base::NonThreadSafe {
// call MarkEndOfChunks() to indicate the end of upload data.
//
// This method may be called only after calling EnableChunkedUpload().
- void AppendChunkToUpload(const char* bytes,
- int bytes_len,
- bool is_last_chunk);
+ void AppendChunkToUpload(const char* bytes, int bytes_len);
+
+ // Indicates the end of a chunked transfer encoded request body.
+ void MarkEndOfChunks();
// Set the upload data directly.
void set_upload(net::UploadData* upload);
diff --git a/net/url_request/url_request_unittest.cc b/net/url_request/url_request_unittest.cc
index d0b8f58..5e03f9b 100644
--- a/net/url_request/url_request_unittest.cc
+++ b/net/url_request/url_request_unittest.cc
@@ -178,12 +178,13 @@ class URLRequestTestHTTP : public URLRequestTest {
}
void AddChunksToUpload(TestURLRequest* r) {
- r->AppendChunkToUpload("a", 1, false);
- r->AppendChunkToUpload("bcd", 3, false);
- r->AppendChunkToUpload("this is a longer chunk than before.", 35, false);
- r->AppendChunkToUpload("\r\n\r\n", 4, false);
- r->AppendChunkToUpload("0", 1, false);
- r->AppendChunkToUpload("2323", 4, true);
+ r->AppendChunkToUpload("a", 1);
+ r->AppendChunkToUpload("bcd", 3);
+ r->AppendChunkToUpload("this is a longer chunk than before.", 35);
+ r->AppendChunkToUpload("\r\n\r\n", 4);
+ r->AppendChunkToUpload("0", 1);
+ r->AppendChunkToUpload("2323", 4);
+ r->MarkEndOfChunks();
}
void VerifyReceivedDataMatchesChunks(TestURLRequest* r, TestDelegate* d) {