Added chunked upload support for embedded_test_server

net/test/embedded_test_server/http_request.cc

Index: net/test/embedded_test_server/http_request.cc
diff --git a/net/test/embedded_test_server/http_request.cc b/net/test/embedded_test_server/http_request.cc
index 3156e5134faa29cfe86586bc03d8ecbcef7ea137..e0991d6c4ba4e12856797357e86e725b67721ea3 100644
--- a/net/test/embedded_test_server/http_request.cc
+++ b/net/test/embedded_test_server/http_request.cc
@@ -10,6 +10,7 @@
 #include "base/strings/string_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "net/http/http_chunked_decoder.h"
 
 namespace net {
 namespace test_server {
@@ -140,6 +141,13 @@ HttpRequestParser::ParseResult HttpRequestParser::ParseHeaders() {
         http_request_->headers["Content-Length"],
         &declared_content_length_);
     DCHECK(success) << "Malformed Content-Length header's value.";
+  } else if (http_request_->headers.count("Transfer-Encoding") > 0) {
+    if (http_request_->headers["Transfer-Encoding"] == "chunked") {
+      http_request_->has_content = true;
+      chunked_decoder_.reset(new HttpChunkedDecoder());
+      state_ = STATE_CONTENT;
+      return WAITING;
+    }
   }
   if (declared_content_length_ == 0) {
     // No content data, so parsing is finished.
@@ -155,6 +163,26 @@ HttpRequestParser::ParseResult HttpRequestParser::ParseHeaders() {
 
 HttpRequestParser::ParseResult HttpRequestParser::ParseContent() {
   const size_t available_bytes = buffer_.size() - buffer_position_;
+  if (chunked_decoder_.get()) {
+    int bytes_written = chunked_decoder_->FilterBuf(&buffer_[buffer_position_],

[xunjieli, 2015/02/12 22:15:45]

I can't use buffer_.data() here, as it complain that it is a const char *. What
else can I try? (besides changing buffer_ to vector<char>)

[mmenke, 2015/02/13 17:53:29]

Looks like in StringIOBuffer we use const_cast<char*>(buffer_.data()).  Suggest
using that here, and then you can add buffer_position_ to that.  Not a fan of
that, either, but at least we're already depending on it working.  I would not
be surprised if we're depending on this pattern working elsewhere, but I'm a bit
happier using data().

[xunjieli, 2015/02/13 18:36:14]

Done. SGTM! casting away constness it is!

+                                                    available_bytes);
+    http_request_->content.append(buffer_.data() + buffer_position_,
+                                  bytes_written);
+
+    if (chunked_decoder_->reached_eof()) {
+      buffer_ = std::string(
+          buffer_.data() + buffer_.size() - chunked_decoder_->bytes_after_eof(),
+          chunked_decoder_->bytes_after_eof());

[mmenke, 2015/02/13 17:53:29]

Suggest buffer_ = buffer_.substring(buffer_.size() -
chunked_decoder_->bytes_after_eof());  (Or could use
chunked_decoder_->bytes_after_eof() as the second parameter)

[xunjieli, 2015/02/13 18:36:14]

Done.

+      buffer_position_ = 0;
+      state_ = STATE_ACCEPTED;
+      return ACCEPTED;
+    }
+    buffer_ = "";
+    buffer_position_ = 0;
+    state_ = STATE_CONTENT;
+    return WAITING;
+  }
+
   const size_t fetch_bytes = std::min(
       available_bytes,
       declared_content_length_ - http_request_->content.size());