Second Life viewer sources 1.23.0-RC

1 files changed, 10 insertions, 3 deletions

diff --git a/linden/indra/llmessage/llhttpnode.cpp b/linden/indra/llmessage/llhttpnode.cpp
index 0d60a64..2ba900a 100644
--- a/linden/indra/llmessage/llhttpnode.cpp
+++ b/linden/indra/llmessage/llhttpnode.cpp
@@ -17,7 +17,8 @@
  * There are special exceptions to the terms and conditions of the GPL as
  * it is applied to this Source Code. View the full text of the exception
  * in the file doc/FLOSS-exception.txt in this software distribution, or
- * online at http://secondlifegrid.net/programs/open_source/licensing/flossexception
+ * online at
+ * http://secondlifegrid.net/programs/open_source/licensing/flossexception
  * 
  * By copying, modifying or distributing this software, you acknowledge
  * that you have read and understood your obligations described above,
@@ -35,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");
 
 /**
@@ -180,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");
@@ -474,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;