summaryrefslogtreecommitdiff
path: root/indra/llmessage/llproxy.cpp
diff options
context:
space:
mode:
authorErik Kundiman <erik@megapahit.org>2025-05-09 06:42:28 +0800
committerErik Kundiman <erik@megapahit.org>2025-05-09 06:42:28 +0800
commitc06c7e0b0eb4b7a7aaa70a3559b08b18c73aea17 (patch)
tree1a460744fcb104f56cd28af927f4cb3d2a18cdc8 /indra/llmessage/llproxy.cpp
parent5ced1ff13ffce84e052500eb8fa898ba24bc5d93 (diff)
parent377d1b3813077619fc795f54f93b0d478cf03cbd (diff)
Merge tag 'Second_Life_Release#377d1b38-2025.04' into 2025.04
Diffstat (limited to 'indra/llmessage/llproxy.cpp')
-rw-r--r--indra/llmessage/llproxy.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/indra/llmessage/llproxy.cpp b/indra/llmessage/llproxy.cpp
index d713cb20d9..5d105eba34 100644
--- a/indra/llmessage/llproxy.cpp
+++ b/indra/llmessage/llproxy.cpp
@@ -504,6 +504,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);