Hawkin
/
arangodb
mirror of https://gitee.com/bigwinds/arangodb
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

added 100-continue

This commit is contained in:
Frank Celler 2012-04-16 16:43:04 +02:00
parent e58e443228
commit db2e47c3ef
2 changed files with 22 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
HttpServer/HttpCommTask.cpp
View File

@ -95,6 +95,7 @@ namespace triagens {
LOGGER_TRACE << "HTTP READ FOR " << static_cast<Task*>(this) << ":\n" LOGGER_TRACE << "HTTP READ FOR " << static_cast<Task*>(this) << ":\n"
<< string(readBuffer->c_str(), readPosition); << string(readBuffer->c_str(), readPosition);
// check that we know, how to serve this request
request = server->createRequest(readBuffer->c_str(), readPosition); request = server->createRequest(readBuffer->c_str(), readPosition);
if (request == 0) { if (request == 0) {
@ -102,12 +103,15 @@ namespace triagens {
return false; return false;
} }
// update the connection information, i. e. client and server addresses and ports
request->setConnectionInfo(connectionInfo); request->setConnectionInfo(connectionInfo);
LOGGER_TRACE << "server port = " << connectionInfo.serverPort << ", client port = " << connectionInfo.clientPort; LOGGER_TRACE << "server port = " << connectionInfo.serverPort << ", client port = " << connectionInfo.clientPort;
// set body start to current position
bodyPosition = readPosition; bodyPosition = readPosition;
// and different methods
switch (request->requestType()) { switch (request->requestType()) {
case HttpRequest::HTTP_REQUEST_GET: case HttpRequest::HTTP_REQUEST_GET:
case HttpRequest::HTTP_REQUEST_DELETE: case HttpRequest::HTTP_REQUEST_DELETE:
@ -115,7 +119,7 @@ namespace triagens {
bodyLength = request->contentLength(); bodyLength = request->contentLength();
if (bodyLength > 0) { if (bodyLength > 0) {
LOGGER_DEBUG << "received http GET/DELETE/HEAD request with body length, this should not happen"; LOGGER_WARNING << "received http GET/DELETE/HEAD request with body length, this should not happen";
readRequestBody = true; readRequestBody = true;
} }
else { else {
@ -139,6 +143,22 @@ namespace triagens {
LOGGER_WARNING << "got corrupted HTTP request '" << string(readBuffer->c_str(), (readPosition < 6 ? readPosition : 6)) << "'"; LOGGER_WARNING << "got corrupted HTTP request '" << string(readBuffer->c_str(), (readPosition < 6 ? readPosition : 6)) << "'";
return false; return false;
} }
// check for a 100-continue
if (readRequestBody) {
bool found;
string const& expect = request->header("expect", found);
if (found && StringUtils::trim(expect) == "100-continue") {
LOGGER_TRACE << "received a 100-continue request";
StringBuffer* buffer = new StringBuffer();
buffer->appendText("HTTP/1.1 100 (Continue)\r\n\r\n");
writeBuffers.push_back(buffer);
fillWriteBuffer();
}
}
} }
else { else {
if (readBuffer->c_str() < end) { if (readBuffer->c_str() < end) {

2
Rest/HttpRequest.cpp
View File

@ -103,7 +103,7 @@ namespace triagens {
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
size_t HttpRequest::contentLength () const { size_t HttpRequest::contentLength () const {
string const& contentLengthString = StringUtils::trim(header("content-length")); string const contentLengthString = StringUtils::trim(header("content-length"));
if (contentLengthString != "") { if (contentLengthString != "") {
return StringUtils::uint32(contentLengthString); return StringUtils::uint32(contentLengthString);