From 429729b592854d724e669706b850c80df1ae0eea Mon Sep 17 00:00:00 2001
From: Rider Linden <rider@lindenlab.com>
Date: Thu, 19 Nov 2015 17:15:17 -0800
Subject: [PATCH] MAINT-5804, MAINT-5890: Incorrectly trapping timeout in event
poll and canceling coroutine before it's finished.
---
indra/newview/lleventpoll.cpp | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/indra/newview/lleventpoll.cpp b/indra/newview/lleventpoll.cpp
index 40eaba2bac7..72e159bcecd 100755
--- a/indra/newview/lleventpoll.cpp
+++ b/indra/newview/lleventpoll.cpp
@@ -168,9 +168,9 @@ namespace Details
if (!status)
{
- if (status == LLCore::HttpStatus(HTTP_BAD_GATEWAY))
- { // A HTTP_BAD_GATEWAY (502) error is our standard timeout response
- // we get this when there are no events.
+ if (status == LLCore::HttpStatus(LLCore::HttpStatus::EXT_CURL_EASY, CURLE_OPERATION_TIMEDOUT))
+ { // A standard timeout response we get this when there are no events.
+ LL_INFOS("LLEventPollImpl") << "All is very quiet on target server. It may have gone idle?" << LL_ENDL;
errorCount = 0;
continue;
}
@@ -180,7 +180,7 @@ namespace Details
// some cases the server gets ahead of the viewer and will
// return a 404 error (Not Found) before the cancel event
// comes back in the queue
- LL_WARNS() << "Canceling coroutine" << LL_ENDL;
+ LL_WARNS("LLEventPollImpl") << "Canceling coroutine" << LL_ENDL;
break;
}
else if (!status.isHttpStatus())
--
GitLab