Second Life viewer sources 1.19.1.0

1 files changed, 3 insertions, 23 deletions

diff --git a/linden/indra/llmessage/llurlrequest.h b/linden/indra/llmessage/llurlrequest.h
index 3b91a1d..dd82a9f 100644
--- a/linden/indra/llmessage/llurlrequest.h
+++ b/linden/indra/llmessage/llurlrequest.h
@@ -129,18 +129,8 @@ public:
          *
          * Set whether request will check that remote server
          * certificates are signed by a known root CA when using HTTPS.
-         * Use the supplied root certificate bundle if supplied, else use
-         * the standard bundle as found by libcurl and openssl.
          */
-        void checkRootCertificate(bool check, const char* caBundle = NULL);
-
-        /** 
-         * @brief Request a particular response encoding if available.
-         *
-         * This call is a shortcut for requesting a particular encoding
-         * from the server, eg, 'gzip'. 
-         */
-        void requestEncoding(const char* encoding);
+        void checkRootCertificate(bool check);
 
         /**
          * @brief Return at most size bytes of body.
@@ -168,16 +158,6 @@ public:
         void setCallback(LLURLRequestComplete* callback);
         //@}
 
-        /**
-         * @ brief Set certificate authority file used to verify HTTPS certs.
-         */
-        static void setCertificateAuthorityFile(const std::string& file_name);
-
-        /**
-         * @ brief Set certificate authority path used to verify HTTPS certs.
-         */
-        static void setCertificateAuthorityPath(const std::string& path);
-
         /* @name LLIOPipe virtual implementations
          */
 
@@ -234,7 +214,7 @@ private:
          * @brief Download callback method.
          */
         static size_t downCallback(
-                void* data,
+                char* data,
                 size_t size,
                 size_t nmemb,
                 void* user);
@@ -243,7 +223,7 @@ private:
          * @brief Upload callback method.
          */
         static size_t upCallback(
-                void* data,
+                char* data,
                 size_t size,
                 size_t nmemb,
                 void* user);