diff options
| author | Monty Brandenberg <monty@lindenlab.com> | 2014-10-10 16:43:04 -0400 |
|---|---|---|
| committer | Monty Brandenberg <monty@lindenlab.com> | 2014-10-10 16:43:04 -0400 |
| commit | ec4fd2f0e226bb2cae5982760317e1d6ea2d2d69 (patch) | |
| tree | f476b85202a0667372feb964d3c046b2655d0ace /indra/llcorehttp/_httpoprequest.cpp | |
| parent | 99b2d7455467b126b0b6fd7ac3e7d0ef074000a6 (diff) | |
MAINT-4564 HTTP Pipelining is not happening in Drano HTTP Phase 4
Incorporate the new libcurl 7.38.0 build with curl bug 1420
workaround. Add developer-centric testing code to evaluate
the workaround or a future fix for 1420.
Diffstat (limited to 'indra/llcorehttp/_httpoprequest.cpp')
| -rwxr-xr-x | indra/llcorehttp/_httpoprequest.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llcorehttp/_httpoprequest.cpp b/indra/llcorehttp/_httpoprequest.cpp index bbda0b82fd..fbbb1614fb 100755 --- a/indra/llcorehttp/_httpoprequest.cpp +++ b/indra/llcorehttp/_httpoprequest.cpp @@ -626,8 +626,8 @@ HttpStatus HttpOpRequest::prepareRequest(HttpService * service) // *TODO: Find a better scheme than timeouts to guarantee liveness. xfer_timeout *= cpolicy.mPipelining; } - // *DEBUG: Useful for timeout handling and "[curl:bugs] #1420" tests - // xfer_timeout = 3L; + // *DEBUG: Enable following override for timeout handling and "[curl:bugs] #1420" tests + // xfer_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); |