summaryrefslogtreecommitdiff
path: root/indra/llcorehttp
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-10-24 15:57:36 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-10-24 15:57:36 -0400
commitead19aa22cb9cb297ca1c89e96daa85101c1158f (patch)
treecf92d71832f8bfc2347e61b855f7ff3735f80476 /indra/llcorehttp
parent762582c499dcac7564966bcc4222a973e8d4e4b9 (diff)
MAINT-7081: Only request HTTP2 with $VIEWERASSET override (testing)
Diffstat (limited to 'indra/llcorehttp')
-rw-r--r--indra/llcorehttp/_httpoprequest.cpp4
1 files changed, 4 insertions, 0 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp
index 1ef7730c8e..cc49a2af80 100644
--- a/indra/llcorehttp/_httpoprequest.cpp
+++ b/indra/llcorehttp/_httpoprequest.cpp
@@ -736,6 +736,10 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service)
xfer_timeout *= 2L;
// Also try requesting HTTP/2.
+/******************************/
+ // but for test purposes, only if overriding VIEWERASSET
+ if (getenv("VIEWERASSET"))
+/******************************/
check_curl_easy_setopt(mCurlHandle, CURLOPT_HTTP_VERSION, CURL_HTTP_VERSION_2_0);
}
// *DEBUG: Enable following override for timeout handling and "[curl:bugs] #1420" tests