diff options
| author | Logan Dethrow <log@lindenlab.com> | 2011-09-01 16:44:04 -0400 |
|---|---|---|
| committer | Logan Dethrow <log@lindenlab.com> | 2011-09-01 16:44:04 -0400 |
| commit | 6ab0bc878952de08d6ea37876031f65416a5a004 (patch) | |
| tree | 1a1b4c1b852a4aeae1661b772af07a981047c61a /indra/llmessage/llcurl.cpp | |
| parent | 6484dbf28cb8b6ffa745fe9b26beae58d3c68441 (diff) | |
LLProxy start of code review cleanup.
Diffstat (limited to 'indra/llmessage/llcurl.cpp')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index bfdf49c74b..2d456b8f3f 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -499,7 +499,7 @@ void LLCurl::Easy::prepRequest(const std::string& url, //don't verify host name so urls with scrubbed host names will work (improves DNS performance) setopt(CURLOPT_SSL_VERIFYHOST, 0); - setopt(CURLOPT_TIMEOUT, CURL_REQUEST_TIMEOUT); + setopt(CURLOPT_TIMEOUT, llmax(time_out, CURL_REQUEST_TIMEOUT)); setoptString(CURLOPT_URL, url); |