diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-28 11:52:16 -0400 |
|---|---|---|
| committer | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-28 11:52:16 -0400 |
| commit | fe4f85e587fc01319f0570541394eeca57273ba2 (patch) | |
| tree | a3abfa235b1aad022fa5d262a60d639282635bc8 /indra/llmessage/llproxy.cpp | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | de8275b14b30bf754cdba1da867cb2e6c2783639 (diff) | |
Merge remote-tracking branch 'origin/main' into geenz/2025.04-to-develop
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
| -rw-r--r-- | indra/llmessage/llproxy.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp index d04ca52ad6..d79d5c3a11 100644 --- a/indra/llmessage/llproxy.cpp +++ b/indra/llmessage/llproxy.cpp @@ -506,6 +506,7 @@ static apr_status_t tcp_blocking_handshake(LLSocket::ptr_t handle, char * dataou rv = apr_socket_recv(apr_socket, datain, &maxinlen); if (rv != APR_SUCCESS) { + // if rv == 70060 it's WSAETIMEDOUT char buf[MAX_STRING]; LL_WARNS("Proxy") << "Error receiving data from proxy control channel, status: " << rv << " " << apr_strerror(rv, buf, MAX_STRING) << LL_ENDL; ll_apr_warn_status(rv); |