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

added X-Arango headers

This commit is contained in:
Jan Steemann 2012-09-25 09:41:29 +02:00
parent aeb9f5126b
commit bf7ddd5356
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
arangod/RestHandler/RestBatchHandler.cpp
View File

@ -210,13 +210,21 @@ Handler::status_e RestBatchHandler::execute() {
return Handler::HANDLER_FAILED; return Handler::HANDLER_FAILED;
} }
HttpResponsePart* partResponse = dynamic_cast<HttpResponsePart*>(handler->getResponse());
if (partResponse == 0) {
delete handler;
generateError(HttpResponse::BAD, TRI_ERROR_INTERNAL, "an error occured during part request processing");
return Handler::HANDLER_FAILED;
}
// append the boundary for this subpart // append the boundary for this subpart
_response->body().appendText(boundary + "\r\n"); _response->body().appendText(boundary + "\r\n");
// append the response header // append the response header
handler->getResponse()->writeHeader(&_response->body()); partResponse->writeHeader(&_response->body());
// append the response body // append the response body
_response->body().appendText(handler->getResponse()->body()); _response->body().appendText(partResponse->body());
_response->body().appendText("\r\n"); _response->body().appendText("\r\n");
delete handler; delete handler;

15
lib/Rest/HttpResponsePart.cpp
View File

@ -79,7 +79,7 @@ HttpResponsePart::~HttpResponsePart () {
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void HttpResponsePart::writeHeader (StringBuffer* output) { void HttpResponsePart::writeHeader (StringBuffer* output) {
output->appendText("HTTP/1.1 "); output->appendText("X-Arango-status: ");
output->appendText(responseString(_code)); output->appendText(responseString(_code));
output->appendText("\r\n"); output->appendText("\r\n");
@ -108,7 +108,12 @@ void HttpResponsePart::writeHeader (StringBuffer* output) {
} }
char const* value = begin->_value; char const* value = begin->_value;
if (! TRI_EqualString(key, "content-type")) {
// for all headers but content-type, we'll add the prefix "X-Arango-"
output->appendText("X-Arango-");
}
output->appendText(key); output->appendText(key);
output->appendText(": "); output->appendText(": ");
output->appendText(value); output->appendText(value);
@ -116,16 +121,16 @@ void HttpResponsePart::writeHeader (StringBuffer* output) {
} }
if (seenTransferEncoding && transferEncoding == "chunked") { if (seenTransferEncoding && transferEncoding == "chunked") {
output->appendText("transfer-encoding: chunked\r\n\r\n"); output->appendText("X-Arango-transfer-encoding: chunked\r\n\r\n");
} }
else { else {
if (seenTransferEncoding) { if (seenTransferEncoding) {
output->appendText("transfer-encoding: "); output->appendText("X-Arango-transfer-encoding: ");
output->appendText(transferEncoding); output->appendText(transferEncoding);
output->appendText("\r\n"); output->appendText("\r\n");
} }
output->appendText("content-length: "); output->appendText("X-Arango-content-length: ");
if (_isHeadResponse) { if (_isHeadResponse) {
output->appendInteger(_bodySize); output->appendInteger(_bodySize);