From bfabb7bd2b02654e00f5b8d12541e9bec9cbbad7 Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Fri, 19 Feb 2016 11:19:50 -0800
Subject: MAINT-6137: Re enable pipelining by default, use new version of CURL
 (7.47) with corrections for timed out connections in pipelining. Minor fix
 for safer op retrieval.

---
 indra/newview/app_settings/settings.xml | 2 +-
 indra/newview/llappcorehttp.cpp         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'indra/newview')

diff --git a/indra/newview/app_settings/settings.xml b/indra/newview/app_settings/settings.xml
index 46fd9a27e3..d5549013fa 100755
--- a/indra/newview/app_settings/settings.xml
+++ b/indra/newview/app_settings/settings.xml
@@ -4557,7 +4557,7 @@
       <key>Type</key>
       <string>Boolean</string>
       <key>Value</key>
-      <integer>0</integer>
+      <integer>1</integer>
     </map>
     <key>HttpRangeRequestsDisable</key>
     <map>
diff --git a/indra/newview/llappcorehttp.cpp b/indra/newview/llappcorehttp.cpp
index c13c4f982a..7dee309a62 100755
--- a/indra/newview/llappcorehttp.cpp
+++ b/indra/newview/llappcorehttp.cpp
@@ -125,7 +125,7 @@ LLAppCoreHttp::LLAppCoreHttp()
 	  mStopHandle(LLCORE_HTTP_HANDLE_INVALID),
 	  mStopRequested(0.0),
 	  mStopped(false),
-	  mPipelined(false)
+	  mPipelined(true)
 {}
 
 
@@ -359,7 +359,7 @@ void LLAppCoreHttp::refreshSettings(bool initial)
 	static const std::string http_pipelining("HttpPipelining");
 	if (gSavedSettings.controlExists(http_pipelining))
 	{
-		// Default to false (in ctor) if absent.
+		// Default to true (in ctor) if absent.
 		bool pipelined(gSavedSettings.getBOOL(http_pipelining));
 		if (pipelined != mPipelined)
 		{
-- 
cgit v1.2.3