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/_httppolicy.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/_httppolicy.cpp')
| -rwxr-xr-x | indra/llcorehttp/_httppolicy.cpp | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/indra/llcorehttp/_httppolicy.cpp b/indra/llcorehttp/_httppolicy.cpp index 09b9206f63..e5d6321401 100755 --- a/indra/llcorehttp/_httppolicy.cpp +++ b/indra/llcorehttp/_httppolicy.cpp @@ -414,6 +414,18 @@ bool HttpPolicy::stageAfterCompletion(HttpOpRequest * op) // Retry or finalize if (! op->mStatus) { + // *DEBUG: For "[curl:bugs] #1420" tests. This will interfere + // with unit tests due to allocation retention by logging code. + // But you won't be checking this in enabled. +#if 0 + if (op->mStatus == HttpStatus(HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT)) + { + LL_WARNS(LOG_CORE) << "HTTP request " << static_cast<HttpHandle>(op) + << " timed out." + << LL_ENDL; + } +#endif + // If this failed, we might want to retry. if (op->mPolicyRetries < op->mPolicyRetryLimit && op->mStatus.isRetryable()) { |