Second Life viewer sources 1.22.0-RC

1 files changed, 6 insertions, 1 deletions

diff --git a/linden/indra/llmessage/lliohttpserver.cpp b/linden/indra/llmessage/lliohttpserver.cpp
index d4155f6..64222ff 100644
--- a/linden/indra/llmessage/lliohttpserver.cpp
+++ b/linden/indra/llmessage/lliohttpserver.cpp
@@ -47,6 +47,7 @@
 #include "llpumpio.h"
 #include "llsd.h"
 #include "llsdserialize_xml.h"
+#include "llstat.h"
 #include "llstl.h"
 #include "lltimer.h"
 
@@ -171,22 +172,26 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                 std::string verb = context[CONTEXT_REQUEST][CONTEXT_VERB];
                 if(verb == HTTP_VERB_GET)
                 {
+            LLPerfBlock getblock("http_get");   
                         mNode.get(LLHTTPNode::ResponsePtr(mResponse), context);
                 }
                 else if(verb == HTTP_VERB_PUT)
                 {
+            LLPerfBlock putblock("http_put");
                         LLSD input;
                         LLSDSerialize::fromXML(input, istr);
                         mNode.put(LLHTTPNode::ResponsePtr(mResponse), context, input);
                 }
                 else if(verb == HTTP_VERB_POST)
                 {
+            LLPerfBlock postblock("http_post");
                         LLSD input;
                         LLSDSerialize::fromXML(input, istr);
                         mNode.post(LLHTTPNode::ResponsePtr(mResponse), context, input);
                 }
                 else if(verb == HTTP_VERB_DELETE)
                 {
+            LLPerfBlock delblock("http_delete");
                         mNode.del(LLHTTPNode::ResponsePtr(mResponse), context);
                 }               
                 else if(verb == HTTP_VERB_OPTIONS)
@@ -240,7 +245,7 @@ LLIOPipe::EStatus LLHTTPPipe::process_impl(
                 case STATE_GOOD_RESULT:
                 {
                         LLSD headers = mHeaders;
-                        headers["Content-Type"] = "application/xml";
+                        headers["Content-Type"] = "application/llsd+xml";
                         context[CONTEXT_RESPONSE][CONTEXT_HEADERS] = headers;
                         LLBufferStream ostr(channels, buffer.get());
                         LLSDSerialize::toXML(mGoodResult, ostr);