svn merge -r 80357:80990 svn+ssh://svn.lindenlab.com/svn/linden/branches/Branch_1-19-1-Server --> release

Merge patches from 1.19.1 Server branch:

* QAR-293 Fix for hardcoded TTLs in web dataservices
* DEV-10826 fix for busted binary and notation parse if handed an unlimited parse size
* Bounce apache2 processes before starting backbone/dataserver/simulator
* Changing web-ds TTL in a way that any query that has 0 < ttl <=60 will have ttl = 61.
* Partial reversion of multiagent-chat to 1.19.0 to address fast memory leak
* Fixed minor, non user facing bug in multiagentchat
* set-classified-stats: Rewrote to use new MDB2 query reformatting syntax
* Fixed possible bad conversion of vivox data
* DEV-550, caching changes to DirClassifieds Query
* QAR-240 (DEV-8488) Prevent residents from purging stuff that isn't trash on the backend
* More mem leak fixes for multiagent-chat
* QAR-274 Fetch inventory descendents over TCP (via HTTP cap) instead of UDP
* DEV-10151: Sometimes group IMs appear to be person to person IMs
* QAR-321 Changes to crash_reporter
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY) on the username table if the first-name query fragment is >= 3 chars
* DEV-11004 Speed up people search query using FORCE INDEX (PRIMARY).  Web service version of this, must use two named queries because we need to change the query based on input string length.

1 files changed, 3 insertions, 23 deletions

diff --git a/indra/llmessage/llurlrequest.h b/indra/llmessage/llurlrequest.h
index 5bdb6a1e69..b154794ff1 100644
--- a/indra/llmessage/llurlrequest.h
+++ b/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);