diff options
| author | Rider Linden <rider@lindenlab.com> | 2016-02-19 11:19:50 -0800 |
|---|---|---|
| committer | Rider Linden <rider@lindenlab.com> | 2016-02-19 11:19:50 -0800 |
| commit | bfabb7bd2b02654e00f5b8d12541e9bec9cbbad7 (patch) | |
| tree | 3c1763ccc80a414d06941c76b0299486e4cf2a69 /indra/llcorehttp/_httpoprequest.cpp | |
| parent | 70d4c0ad7da483df2b5e621dd20467b4fd67ab51 (diff) | |
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.
Diffstat (limited to 'indra/llcorehttp/_httpoprequest.cpp')
| -rwxr-xr-x | indra/llcorehttp/_httpoprequest.cpp | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index 557f6207b5..db57869a1b 100755 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -750,7 +750,11 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) xfer_timeout *= 2L; } // *DEBUG: Enable following override for timeout handling and "[curl:bugs] #1420" tests - // xfer_timeout = 1L; + //if (cpolicy.mPipelining) + //{ + // xfer_timeout = 1L; + // timeout = 1L; + //} code = curl_easy_setopt(mCurlHandle, CURLOPT_TIMEOUT, xfer_timeout); check_curl_easy_code(code, CURLOPT_TIMEOUT); code = curl_easy_setopt(mCurlHandle, CURLOPT_CONNECTTIMEOUT, timeout); |