diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2025-03-12 04:32:05 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-03-12 04:32:05 +0200 |
| commit | b50ad90febda24d2296541f46ea1a129232aad70 (patch) | |
| tree | d0c25fc032c156814b4b05c892dcfce1737508a1 /indra/llmessage/llproxy.cpp | |
| parent | e70694e67cd1902fd2a797e24c48f08643291538 (diff) | |
| parent | 8297b923f0bec459ca2bfa916cf777ac5aa3af9e (diff) | |
Merge pull request #3708 from secondlife/marchcat/2025.03-maint-b
2025.03 Cherry pick from Maint B
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rw-r--r-- | indra/llmessage/llproxy.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index 864e68998c..d04ca52ad6 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -465,7 +465,7 @@ void LLProxy::applyProxySettings(CURL* handle) /** * @brief Send one TCP packet and receive one in return. * - * This operation is done synchronously with a 1000ms timeout. Therefore, it should not be used when a blocking + * This operation is done synchronously with a 100ms timeout. Therefore, it should not be used when a blocking * operation would impact the operation of the viewer. * * @param handle_ptr Pointer to a connected LLSocket of type STREAM_TCP. @@ -482,7 +482,7 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou apr_size_t expected_len = outlen; - handle->setBlocking(1000); + handle->setBlocking(100000); // 100ms, 100000us. Should be sufficient for localhost, nearby network rv = apr_socket_send(apr_socket, dataout, &outlen); if (APR_SUCCESS != rv) |