diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-10-03 17:59:39 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2015-10-03 17:59:39 +0900 |
| commit | c81b1321122e8509b55c94c0cbca0d8d6d319f0c (patch) | |
| tree | f24b49dd9cceb006172dbd09da4e5f5d3371241b /src/HttpServer.cc | |
| parent | c63fc414c389c893c80022669a7d75f3c6869c7e (diff) | |
| parent | 85faafcaf233855042aead1cc522375fa7955d7e (diff) | |
Merge branch 'master' into random-webseeding
Diffstat (limited to 'src/HttpServer.cc')
| -rw-r--r-- | src/HttpServer.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/HttpServer.cc b/src/HttpServer.cc index cac0cc7f..455f8afe 100644 --- a/src/HttpServer.cc +++ b/src/HttpServer.cc @@ -142,7 +142,7 @@ bool HttpServer::receiveRequest() lastRequestHeader_ = headerProcessor_->getResult(); A2_LOG_INFO(fmt("HTTP Server received request\n%s", headerProcessor_->getHeaderString().c_str())); - socketRecvBuffer_->shiftBuffer(headerProcessor_->getLastBytesProcessed()); + socketRecvBuffer_->drain(headerProcessor_->getLastBytesProcessed()); bodyConsumed_ = 0; if(setupResponseRecv() < 0) { A2_LOG_INFO("Request path is invaild. Ignore the request body."); @@ -175,7 +175,7 @@ bool HttpServer::receiveRequest() } return true; } else { - socketRecvBuffer_->shiftBuffer(headerProcessor_->getLastBytesProcessed()); + socketRecvBuffer_->drain(headerProcessor_->getLastBytesProcessed()); return false; } } @@ -197,7 +197,7 @@ bool HttpServer::receiveBody() if(lastBody_) { lastBody_->writeData(socketRecvBuffer_->getBuffer(), length, 0); } - socketRecvBuffer_->shiftBuffer(length); + socketRecvBuffer_->drain(length); bodyConsumed_ += length; return lastContentLength_ == bodyConsumed_; } |