Ported some cURL and HTTP-related changes from Snowglobe.

3 files changed, 39 insertions, 16 deletions

diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index 811d4af..12321fe 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -220,7 +220,7 @@ public:
         U32 report(CURLcode);
         void getTransferInfo(LLCurl::TransferInfo* info);
 
-        void prepRequest(const std::string& url, ResponderPtr, bool post = false);
+        void prepRequest(const std::string& url, const std::vector<std::string>& headers, ResponderPtr, bool post = false);
         
         const char* getErrorBuffer();
 
@@ -432,7 +432,9 @@ size_t curlHeaderCallback(void* data, size_t size, size_t nmemb, void* user_data
         return n;
 }
 
-void LLCurl::Easy::prepRequest(const std::string& url, ResponderPtr responder, bool post)
+void LLCurl::Easy::prepRequest(const std::string& url,
+                                                           const std::vector<std::string>& headers,
+                                                           ResponderPtr responder, bool post)
 {
         resetState();
         
@@ -465,8 +467,13 @@ void LLCurl::Easy::prepRequest(const std::string& url, ResponderPtr responder, b
         {
                 slist_append("Connection: keep-alive");
                 slist_append("Keep-alive: 300");
+                // Accept and other headers
+                for (std::vector<std::string>::const_iterator iter = headers.begin();
+                         iter != headers.end(); ++iter)
+                {
+                        slist_append((*iter).c_str());
+                }
         }
-        // *FIX: should have ACCEPT headers
 }
 
 ////////////////////////////////////////////////////////////////////////////
@@ -676,15 +683,18 @@ LLCurlRequest::LLCurlRequest() :
         mActiveMulti(NULL),
         mActiveRequestCount(0)
 {
+        mThreadID = LLThread::currentID();
 }
 
 LLCurlRequest::~LLCurlRequest()
 {
+        llassert_always(mThreadID == LLThread::currentID());
         for_each(mMultiSet.begin(), mMultiSet.end(), DeletePointer());
 }
 
 void LLCurlRequest::addMulti()
 {
+        llassert_always(mThreadID == LLThread::currentID());
         LLCurl::Multi* multi = new LLCurl::Multi();
         mMultiSet.insert(multi);
         mActiveMulti = multi;
@@ -714,17 +724,20 @@ bool LLCurlRequest::addEasy(LLCurl::Easy* easy)
 
 void LLCurlRequest::get(const std::string& url, LLCurl::ResponderPtr responder)
 {
-        getByteRange(url, 0, -1, responder);
+        getByteRange(url, headers_t(), 0, -1, responder);
 }
         
-bool LLCurlRequest::getByteRange(const std::string& url, S32 offset, S32 length, LLCurl::ResponderPtr responder)
+bool LLCurlRequest::getByteRange(const std::string& url,
+                                                                 const headers_t& headers,
+                                                                 S32 offset, S32 length,
+                                                                 LLCurl::ResponderPtr responder)
 {
         LLCurl::Easy* easy = allocEasy();
         if (!easy)
         {
                 return false;
         }
-        easy->prepRequest(url, responder);
+        easy->prepRequest(url, headers, responder);
         easy->setopt(CURLOPT_HTTPGET, 1);
         if (length > 0)
         {
@@ -736,14 +749,17 @@ bool LLCurlRequest::getByteRange(const std::string& url, S32 offset, S32 length,
         return res;
 }
 
-bool LLCurlRequest::post(const std::string& url, const LLSD& data, LLCurl::ResponderPtr responder)
+bool LLCurlRequest::post(const std::string& url,
+                                                 const headers_t& headers,
+                                                 const LLSD& data,
+                                                 LLCurl::ResponderPtr responder)
 {
         LLCurl::Easy* easy = allocEasy();
         if (!easy)
         {
                 return false;
         }
-        easy->prepRequest(url, responder);
+        easy->prepRequest(url, headers, responder);
 
         LLSDSerialize::toXML(data, easy->getInput());
         S32 bytes = easy->getInput().str().length();
@@ -763,6 +779,7 @@ bool LLCurlRequest::post(const std::string& url, const LLSD& data, LLCurl::Respo
 // Note: call once per frame
 S32 LLCurlRequest::process()
 {
+        llassert_always(mThreadID == LLThread::currentID());
         S32 res = 0;
         for (curlmulti_set_t::iterator iter = mMultiSet.begin();
                  iter != mMultiSet.end(); )
@@ -782,6 +799,7 @@ S32 LLCurlRequest::process()
 
 S32 LLCurlRequest::getQueued()
 {
+        llassert_always(mThreadID == LLThread::currentID());
         S32 queued = 0;
         for (curlmulti_set_t::iterator iter = mMultiSet.begin();
                  iter != mMultiSet.end(); )
diff --git a/linden/indra/llmessage/llcurl.h b/linden/indra/llmessage/llcurl.h
index ff63904..3e9c0d4 100644
--- a/linden/indra/llmessage/llcurl.h
+++ b/linden/indra/llmessage/llcurl.h
@@ -188,12 +188,14 @@ namespace boost
 class LLCurlRequest
 {
 public:
+        typedef std::vector<std::string> headers_t;
+        
         LLCurlRequest();
         ~LLCurlRequest();
 
         void get(const std::string& url, LLCurl::ResponderPtr responder);
-        bool getByteRange(const std::string& url, S32 offset, S32 length, LLCurl::ResponderPtr responder);
-        bool post(const std::string& url, const LLSD& data, LLCurl::ResponderPtr responder);
+        bool getByteRange(const std::string& url, const headers_t& headers, S32 offset, S32 length, LLCurl::ResponderPtr responder);
+        bool post(const std::string& url, const headers_t& headers, const LLSD& data, LLCurl::ResponderPtr responder);
         S32  process();
         S32  getQueued();
 
@@ -207,6 +209,7 @@ private:
         curlmulti_set_t mMultiSet;
         LLCurl::Multi* mActiveMulti;
         S32 mActiveRequestCount;
+        U32 mThreadID; // debug
 };
 
 class LLCurlEasyRequest
diff --git a/linden/indra/llmessage/llhttpclient.cpp b/linden/indra/llmessage/llhttpclient.cpp
index 4c466c5..23d9529 100644
--- a/linden/indra/llmessage/llhttpclient.cpp
+++ b/linden/indra/llmessage/llhttpclient.cpp
@@ -161,9 +161,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;
@@ -190,9 +191,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;
                 }