diff options
| author | graham linden <graham@lindenlab.com> | 2013-02-14 10:58:53 -0800 |
|---|---|---|
| committer | graham linden <graham@lindenlab.com> | 2013-02-14 10:58:53 -0800 |
| commit | 69133ca4e318fc93fed39589c9221251440bcb96 (patch) | |
| tree | 2dc4e923ba0a60b237f82df0aa9780e8cf378d0a /indra/llmessage | |
| parent | e2f3ea50d57ac530512e0ed77c537f0722198c18 (diff) | |
| parent | cc260a635674c56d8fab88a5cd4dd188b4c9ac9c (diff) | |
Merged lindenlab/viewer-cat into default
Diffstat (limited to 'indra/llmessage')
| -rw-r--r-- | indra/llmessage/llcurl.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/indra/llmessage/llcurl.cpp b/indra/llmessage/llcurl.cpp index 8ffa8e4271..6da153279c 100644 --- a/indra/llmessage/llcurl.cpp +++ b/indra/llmessage/llcurl.cpp @@ -72,7 +72,8 @@ static const U32 EASY_HANDLE_POOL_SIZE = 5; static const S32 MULTI_PERFORM_CALL_REPEAT = 5; -static const S32 CURL_REQUEST_TIMEOUT = 30; // seconds per operation +static const S32 CURL_REQUEST_TIMEOUT = 120; // seconds per operation +static const S32 CURL_CONNECT_TIMEOUT = 30; //seconds to wait for a connection static const S32 MAX_ACTIVE_REQUEST_COUNT = 100; // DEBUG // @@ -515,6 +516,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, llmax(time_out, CURL_REQUEST_TIMEOUT)); + setopt(CURLOPT_CONNECTTIMEOUT, CURL_CONNECT_TIMEOUT); setoptString(CURLOPT_URL, url); |