diff options
| author | Jonathan "Geenz" Goodman <geenz@lindenlab.com> | 2025-05-31 09:33:42 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-05-31 09:33:42 -0400 |
| commit | c88f5d26dc894f8d82b948c387a9a3b70862731b (patch) | |
| tree | fd96237f2a595396cd4a2861f976483ea8ef1544 /indra/llmessage/llproxy.cpp | |
| parent | aeefc73129978f6f2c1ba8caaff2750eff2cfbb3 (diff) | |
| parent | 39625d10b8a50ed4ca91d618d6ad638b99087e35 (diff) | |
Merge pull request #4176 from secondlife/geenz/2025.04-to-develop
Merge 2025.04 into 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); |