From aa2b978bf59dd74083bec86c61a29fefb4ebb14c Mon Sep 17 00:00:00 2001 From: Kelly Washington Date: Tue, 24 Feb 2009 19:29:36 +0000 Subject: merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk --- indra/llmessage/llhttpnode.cpp | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'indra/llmessage/llhttpnode.cpp') diff --git a/indra/llmessage/llhttpnode.cpp b/indra/llmessage/llhttpnode.cpp index 0114ad0713..2ba900a533 100644 --- a/indra/llmessage/llhttpnode.cpp +++ b/indra/llmessage/llhttpnode.cpp @@ -36,8 +36,8 @@ #include #include "llstl.h" +#include "lliohttpserver.h" // for string constants -static const std::string CONTEXT_REQUEST("request"); static const std::string CONTEXT_WILDCARD("wildcard"); /** @@ -181,7 +181,8 @@ void LLHTTPNode::options(ResponsePtr response, const LLSD& context) const //llinfos << "options context: " << context << llendl; // default implementation constructs an url to the documentation. - std::string host = context[CONTEXT_REQUEST]["headers"]["host"].asString(); + std::string host( + context[CONTEXT_REQUEST][CONTEXT_HEADERS]["host"].asString()); if(host.empty()) { response->status(400, "Bad Request -- need Host header"); @@ -475,6 +476,11 @@ void LLSimpleResponse::result(const LLSD& result) status(200, "OK"); } +void LLSimpleResponse::extendedResult(S32 code, const std::string& body, const LLSD& headers) +{ + status(code,body); +} + void LLSimpleResponse::status(S32 code, const std::string& message) { mCode = code; -- cgit v1.2.3