Second Life viewer sources 1.19.1.0

1 files changed, 16 insertions, 55 deletions

diff --git a/linden/indra/llmessage/llhttpclient.h b/linden/indra/llmessage/llhttpclient.h
index 703ee61..1587268 100644
--- a/linden/indra/llmessage/llhttpclient.h
+++ b/linden/indra/llmessage/llhttpclient.h
@@ -41,7 +41,7 @@
 #include <boost/intrusive_ptr.hpp>
 
 #include "llassettype.h"
-#include "llbuffer.h"
+#include "llcurl.h"
 #include "lliopipe.h"
 
 extern const F32 HTTP_REQUEST_EXPIRY_SECS;
@@ -54,48 +54,23 @@ class LLSD;
 class LLHTTPClient
 {
 public:
-        class Responder
-        {
-        public:
-                Responder();
-                virtual ~Responder();
-
-                /**
-                 * @brief return true if the status code indicates success.
-                 */
-                static bool isGoodStatus(U32 status)
-                {
-                        return((200 <= status) && (status < 300));
-                }
-
-                virtual void error(U32 status, const std::string& reason);      // called with bad status codes
-                
-                virtual void result(const LLSD& content);
-                
-                // Override point for clients that may want to use this class when the response is some other format besides LLSD
-                virtual void completedRaw(U32 status, const std::string& reason, const LLChannelDescriptors& channels,
-                                                                const LLIOPipe::buffer_ptr_t& buffer);
-
-                virtual void completed(U32 status, const std::string& reason, const LLSD& content);
-                        /**< The default implemetnation calls
-                                either:
-                                * result(), or
-                                * error() 
-                        */
-                        
-        public: /* but not really -- don't touch this */
-                U32 mReferenceCount;
-        };
-
-        typedef boost::intrusive_ptr<Responder> ResponderPtr;
-        
+        // class Responder moved to LLCurl
+
+        // For convenience
+        typedef LLCurl::Responder Responder;
+        typedef LLCurl::ResponderPtr ResponderPtr;
+
+        // non-blocking
         static void head(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void get(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void get(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void get(const std::string& url, const LLSD& query, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-        static void get(const std::string& url, const LLSD& query, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void getByteRange(const std::string& url, S32 offset, S32 bytes, ResponderPtr, const LLSD& headers=LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void get(const std::string& url, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void get(const std::string& url, const LLSD& query, ResponderPtr, const LLSD& headers = LLSD(), const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+
         static void put(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
-                ///< non-blocking
+        static void getHeaderOnly(const std::string& url, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+        static void getHeaderOnly(const std::string& url, ResponderPtr, const LLSD& headers, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
+
+        ///< non-blocking
         static void post(const std::string& url, const LLSD& body, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
         static void post(const std::string& url, const U8* data, S32 size, ResponderPtr responder, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
         static void postFile(const std::string& url, const std::string& filename, ResponderPtr, const F32 timeout=HTTP_REQUEST_EXPIRY_SECS);
@@ -113,20 +88,6 @@ public:
                 ///< must be called before any of the above calls are made
         static bool hasPump();
                 ///< for testing
-        
-        static void setCABundle(const std::string& caBundle);
-                ///< use this root CA bundle when checking SSL connections
-                ///< defaults to the standard system root CA bundle
-                ///< @see LLURLRequest::checkRootCertificate()
 };
 
-
-
-namespace boost
-{
-        void intrusive_ptr_add_ref(LLHTTPClient::Responder* p);
-        void intrusive_ptr_release(LLHTTPClient::Responder* p);
-};
-
-
 #endif // LL_LLHTTPCLIENT_H