1 files changed, 85 insertions, 27 deletions

diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index ef163fa..a07f379 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -106,7 +106,7 @@ namespace
                 LLSDInjector(const LLSD& sd) : mSD(sd) {}
                 virtual ~LLSDInjector() {}
 
-                const char* contentType() { return "application/xml"; }
+                const char* contentType() { return "application/llsd+xml"; }
 
                 virtual EStatus process_impl(const LLChannelDescriptors& channels,
                         buffer_ptr_t& buffer, bool& eos, LLSD& context, LLPumpIO* pump)
@@ -160,9 +160,10 @@ namespace
                                 fstream.seekg(0, std::ios::end);
                                 U32 fileSize = fstream.tellg();
                                 fstream.seekg(0, std::ios::beg);
-                                std::vector<char> fileBuffer(fileSize);
-                                fstream.read(&fileBuffer[0], fileSize);
-                                ostream.write(&fileBuffer[0], fileSize);
+                                char* fileBuffer;
+                                fileBuffer = new char [fileSize];
+                                fstream.read(fileBuffer, fileSize);
+                                ostream.write(fileBuffer, fileSize);
                                 fstream.close();
                                 eos = true;
                                 return STATUS_DONE;
@@ -189,9 +190,10 @@ namespace
                         
                         LLVFile vfile(gVFS, mUUID, mAssetType, LLVFile::READ);
                         S32 fileSize = vfile.getSize();
-                        std::vector<U8> fileBuffer(fileSize);
-                        vfile.read(&fileBuffer[0], fileSize);
-                        ostream.write((char*)&fileBuffer[0], fileSize);
+                        U8* fileBuffer;
+                        fileBuffer = new U8 [fileSize];
+            vfile.read(fileBuffer, fileSize);
+            ostream.write((char*)fileBuffer, fileSize);
                         eos = true;
                         return STATUS_DONE;
                 }
@@ -236,7 +238,8 @@ static void request(
             //the Pragma header it so gratuitously inserts
             //Before inserting the header, force libcurl
             //to not use the proxy (read: llurlrequest.cpp)
-            if ((iter->first == "Pragma") && (iter->second.asString() == ""))
+                        static const std::string PRAGMA("Pragma");
+                        if ((iter->first == PRAGMA) && (iter->second.asString().empty()))
             {
                 req->useProxy(false);
             }
@@ -245,6 +248,19 @@ static void request(
             req->addHeader(header.str().c_str());
         }
     }
+
+        // Check to see if we have already set Accept or not. If no one
+        // set it, set it to application/llsd+xml since that's what we
+        // almost always want.
+        if( method != LLURLRequest::HTTP_PUT && method != LLURLRequest::HTTP_POST )
+        {
+                static const std::string ACCEPT("Accept");
+                if(!headers.has(ACCEPT))
+                {
+                        req->addHeader("Accept: application/llsd+xml");
+                }
+        }
+
         req->setCallback(new LLHTTPClientURLAdaptor(responder));
 
         if (method == LLURLRequest::HTTP_POST  &&  gMessageSystem)
@@ -252,12 +268,22 @@ static void request(
                 req->addHeader(llformat("X-SecondLife-UDP-Listen-Port: %d",
                                                                 gMessageSystem->mPort).c_str());
         }
-        
+
         if (method == LLURLRequest::HTTP_PUT || method == LLURLRequest::HTTP_POST)
         {
-                req->addHeader(llformat("Content-Type: %s",
-                                                                body_injector->contentType()).c_str());
-
+                static const std::string CONTENT_TYPE("Content-Type");
+                if(!headers.has(CONTENT_TYPE))
+                {
+                        // If the Content-Type header was passed in, it has
+                        // already been added as a header through req->addHeader
+                        // in the loop above. We defer to the caller's wisdom, but
+                        // if they did not specify a Content-Type, then ask the
+                        // injector.
+                        req->addHeader(
+                                llformat(
+                                        "Content-Type: %s",
+                                        body_injector->contentType()).c_str());
+                }
                 chain.push_back(LLIOPipe::ptr_t(body_injector));
         }
 
@@ -284,9 +310,13 @@ void LLHTTPClient::getByteRange(
     request(url,LLURLRequest::HTTP_GET, NULL, responder, timeout, headers);
 }
 
-void LLHTTPClient::head(const std::string& url, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::head(
+        const std::string& url,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_HEAD, NULL, responder, timeout, headers);
 }
 
 void LLHTTPClient::get(const std::string& url, ResponderPtr responder, const LLSD& headers, const F32 timeout)
@@ -397,39 +427,66 @@ LLSD LLHTTPClient::blockingGet(const std::string& url)
         return response;
 }
 
-void LLHTTPClient::put(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::put(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_PUT, new LLSDInjector(body), responder, timeout, headers);
 }
 
-void LLHTTPClient::post(const std::string& url, const LLSD& body, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::post(
+        const std::string& url,
+        const LLSD& body,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new LLSDInjector(body), responder, timeout, headers);
 }
 
-void LLHTTPClient::postRaw(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postRaw(
+        const std::string& url,
+        const U8* data,
+        S32 size,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new RawInjector(data, size), responder, timeout, headers);
 }
 
-void LLHTTPClient::postFile(const std::string& url, const std::string& filename, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postFile(
+        const std::string& url,
+        const std::string& filename,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new FileInjector(filename), responder, timeout, headers);
 }
 
-void LLHTTPClient::postFile(const std::string& url, const LLUUID& uuid,
-                                                        LLAssetType::EType asset_type, ResponderPtr responder, const F32 timeout)
+void LLHTTPClient::postFile(
+        const std::string& url,
+        const LLUUID& uuid,
+        LLAssetType::EType asset_type,
+        ResponderPtr responder,
+        const LLSD& headers,
+        const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout);
+        request(url, LLURLRequest::HTTP_POST, new VFileInjector(uuid, asset_type), responder, timeout, headers);
 }
 
 // static
 void LLHTTPClient::del(
         const std::string& url,
         ResponderPtr responder,
+        const LLSD& headers,
         const F32 timeout)
 {
-        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout);
+        request(url, LLURLRequest::HTTP_DELETE, NULL, responder, timeout, headers);
 }
 
 // static
@@ -437,9 +494,10 @@ void LLHTTPClient::move(
         const std::string& url,
         const std::string& destination,
         ResponderPtr responder,
+        const LLSD& hdrs,
         const F32 timeout)
 {
-        LLSD headers;
+        LLSD headers = hdrs;
         headers["Destination"] = destination;
         request(url, LLURLRequest::HTTP_MOVE, NULL, responder, timeout, headers);
 }