Second Life viewer sources 1.21.0-RC

1 files changed, 27 insertions, 33 deletions

diff --git a/linden/indra/llmessage/llcurl.cpp b/linden/indra/llmessage/llcurl.cpp
index f03cebc..834ec4b 100644
--- a/linden/indra/llmessage/llcurl.cpp
+++ b/linden/indra/llmessage/llcurl.cpp
@@ -101,6 +101,12 @@ void LLCurl::setCAFile(const std::string& file)
         sCAFile = file;
 }
 
+//static
+std::string LLCurl::getVersionString()
+{
+        return std::string(curl_version());
+}
+
 //////////////////////////////////////////////////////////////////////////////
 
 LLCurl::Responder::Responder()
@@ -113,6 +119,15 @@ LLCurl::Responder::~Responder()
 }
 
 // virtual
+void LLCurl::Responder::error(
+        U32 status,
+        const std::string& reason,
+        const LLSD&)
+{
+        error(status, reason);
+}
+
+// virtual
 void LLCurl::Responder::error(U32 status, const std::string& reason)
 {
         llinfos << status << ": " << reason << llendl;
@@ -124,38 +139,16 @@ void LLCurl::Responder::result(const LLSD& content)
 }
 
 // virtual
-void LLCurl::Responder::completedRaw(U32 status, const std::string& reason,
-                                                                         const LLChannelDescriptors& channels,
-                                                                         const LLIOPipe::buffer_ptr_t& buffer)
+void LLCurl::Responder::completedRaw(
+        U32 status,
+        const std::string& reason,
+        const LLChannelDescriptors& channels,
+        const LLIOPipe::buffer_ptr_t& buffer)
 {
-        if (isGoodStatus(status))
-        {
-                LLSD content;
-                LLBufferStream istr(channels, buffer.get());
-                LLSDSerialize::fromXML(content, istr);
-/*
-                const S32 parseError = -1;
-                if(LLSDSerialize::fromXML(content, istr) == parseError)
-                {
-                        mStatus = 498;
-                        mReason = "Client Parse Error";
-                }
-*/
-                completed(status, reason, content);
-        }
-        else if (status == 400)
-        {
-                // Get reason from buffer
-                char tbuf[4096];
-                S32 len = 4096;
-                buffer->readAfter(channels.in(), NULL, (U8*)tbuf, len);
-                tbuf[len] = 0;
-                completed(status, std::string(tbuf), LLSD());
-        }
-        else
-        {
-                completed(status, reason, LLSD());
-        }
+        LLSD content;
+        LLBufferStream istr(channels, buffer.get());
+        LLSDSerialize::fromXML(content, istr);
+        completed(status, reason, content);
 }
 
 // virtual
@@ -167,7 +160,7 @@ void LLCurl::Responder::completed(U32 status, const std::string& reason, const L
         }
         else
         {
-                error(status, reason);
+                error(status, reason, content);
         }
 }
 
@@ -281,7 +274,7 @@ LLCurl::Easy::~Easy()
         curl_easy_cleanup(mCurlEasyHandle);
         --gCurlEasyCount;
         curl_slist_free_all(mHeaders);
-        for_each(mStrings.begin(), mStrings.end(), DeletePointer());
+        for_each(mStrings.begin(), mStrings.end(), DeletePointerArray());
 }
 
 void LLCurl::Easy::resetState()
@@ -882,6 +875,7 @@ void LLCurlEasyRequest::sendRequest(const std::string& url)
 {
         llassert_always(!mRequestSent);
         mRequestSent = true;
+        lldebugs << url << llendl;
         if (mEasy)
         {
                 mEasy->setHeaders();