diff options
| author | Kelly Washington <kelly@lindenlab.com> | 2009-02-24 19:29:36 +0000 |
|---|---|---|
| committer | Kelly Washington <kelly@lindenlab.com> | 2009-02-24 19:29:36 +0000 |
| commit | aa2b978bf59dd74083bec86c61a29fefb4ebb14c (patch) | |
| tree | 63d0e55a524208eb2bdad1a1a6f0d03af1b39de2 /indra/llmessage/llhttpnode.cpp | |
| parent | f5242719b628efb148f05ba44ce78f9818ec617a (diff) | |
merge -r 112783:112799 linden/branches/kelly/lsl-http-in-merge to linden/trunk
Diffstat (limited to 'indra/llmessage/llhttpnode.cpp')
| -rw-r--r-- | indra/llmessage/llhttpnode.cpp | 10 |
1 files changed, 8 insertions, 2 deletions
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 <boost/tokenizer.hpp> #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; |