summaryrefslogtreecommitdiff
path: root/src/HttpServer.cc
diff options
context:
space:
mode:
authorTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-04-14 00:25:23 +0900
committerTatsuhiro Tsujikawa <tatsuhiro.t@gmail.com>2015-04-14 00:25:23 +0900
commit692a674fe086b24fa462723688ced2722cfde3b9 (patch)
tree9dcc8efc7e3ec92183ccbee611ce7b1934b071d0 /src/HttpServer.cc
parent8ed8ac0fe8925ab8244e62fbf20de2472480a95f (diff)
SocketRecvBuffer: Eliminate memmove
Since we don't try to read into buffer if buffer is not empty, we don't have to memmove things. This commit mostly rewrites SocketRecvBuffer.
Diffstat (limited to 'src/HttpServer.cc')
-rw-r--r--src/HttpServer.cc6
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_;
}