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

removed some debugging features

This commit is contained in:
Jan Steemann 2015-03-30 22:05:31 +02:00
parent 886398ee41
commit c508eb0a81
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
arangod/RestHandler/RestBatchHandler.cpp
View File

@ -228,9 +228,6 @@ Handler::status_t RestBatchHandler::execute () {
// error // error
generateError(HttpResponse::BAD, TRI_ERROR_HTTP_BAD_PARAMETER, "invalid multipart message received"); generateError(HttpResponse::BAD, TRI_ERROR_HTTP_BAD_PARAMETER, "invalid multipart message received");
LOG_WARNING("received a corrupted multipart message"); LOG_WARNING("received a corrupted multipart message");
#ifdef TRI_ENABLE_MAINTAINER_MODE
LOG_WARNING("We tried to analyse this:\n %s", _request->body());
#endif
return status_t(Handler::HANDLER_FAILED); return status_t(Handler::HANDLER_FAILED);
} }
@ -241,14 +238,14 @@ Handler::status_t RestBatchHandler::execute () {
const size_t partLength = helper.foundLength; const size_t partLength = helper.foundLength;
const char* headerStart = partStart; const char* headerStart = partStart;
char* bodyStart = 0; char* bodyStart = nullptr;
size_t headerLength = 0; size_t headerLength = 0;
size_t bodyLength = 0; size_t bodyLength = 0;
// assume Windows linebreak \r\n\r\n as delimiter // assume Windows linebreak \r\n\r\n as delimiter
char* p = strstr((char*) headerStart, "\r\n\r\n"); char* p = strstr((char*) headerStart, "\r\n\r\n");
if (p != 0 && p + 4 <= partEnd) { if (p != nullptr && p + 4 <= partEnd) {
headerLength = p - partStart; headerLength = p - partStart;
bodyStart = p + 4; bodyStart = p + 4;
bodyLength = partEnd - bodyStart; bodyLength = partEnd - bodyStart;
@ -257,7 +254,7 @@ Handler::status_t RestBatchHandler::execute () {
// test Unix linebreak // test Unix linebreak
p = strstr((char*) headerStart, "\n\n"); p = strstr((char*) headerStart, "\n\n");
if (p != 0 && p + 2 <= partEnd) { if (p != nullptr && p + 2 <= partEnd) {
headerLength = p - partStart; headerLength = p - partStart;
bodyStart = p + 2; bodyStart = p + 2;
bodyLength = partEnd - bodyStart; bodyLength = partEnd - bodyStart;
@ -272,7 +269,7 @@ Handler::status_t RestBatchHandler::execute () {
LOG_TRACE("part header is: %s", string(headerStart, headerLength).c_str()); LOG_TRACE("part header is: %s", string(headerStart, headerLength).c_str());
HttpRequest* request = new HttpRequest(_request->connectionInfo(), headerStart, headerLength, _request->compatibility(), false); HttpRequest* request = new HttpRequest(_request->connectionInfo(), headerStart, headerLength, _request->compatibility(), false);
if (request == 0) { if (request == nullptr) {
generateError(HttpResponse::SERVER_ERROR, TRI_ERROR_OUT_OF_MEMORY); generateError(HttpResponse::SERVER_ERROR, TRI_ERROR_OUT_OF_MEMORY);
return status_t(Handler::HANDLER_FAILED); return status_t(Handler::HANDLER_FAILED);

5
lib/Basics/StringBuffer.h
View File

@ -520,10 +520,7 @@ namespace triagens {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
StringBuffer& appendText (std::string const& str) { StringBuffer& appendText (std::string const& str) {
int res = TRI_AppendString2StringBuffer(&_buffer, str.c_str(), str.length()); TRI_AppendString2StringBuffer(&_buffer, str.c_str(), str.length());
if (res != TRI_ERROR_NO_ERROR) {
THROW_ARANGO_EXCEPTION(res);
}
return *this; return *this;
} }