diff --git a/uppsrc/Core/Http.cpp b/uppsrc/Core/Http.cpp index 0c5aadb4f..97eebeae2 100644 --- a/uppsrc/Core/Http.cpp +++ b/uppsrc/Core/Http.cpp @@ -370,7 +370,7 @@ bool HttpRequest::Do() NEVER(); } - if(phase != FAILED) + if(phase != FAILED) { if(IsSocketError() || IsError()) phase = FAILED; else @@ -383,6 +383,7 @@ bool HttpRequest::Do() HttpError("connection was aborted"); phase = FAILED; } + } if(phase == FAILED) { if(retry_count++ < max_retries) { diff --git a/uppsrc/Core/Socket.cpp b/uppsrc/Core/Socket.cpp index 473b0eb41..f54b4939b 100644 --- a/uppsrc/Core/Socket.cpp +++ b/uppsrc/Core/Socket.cpp @@ -601,7 +601,7 @@ bool TcpSocket::IsGlobalTimeout() bool TcpSocket::RawWait(dword flags, int end_time) { // wait till end_time - LLOG("RawWait end_time: " << end_time << ", current time " << msecs()); + LLOG("RawWait end_time: " << end_time << ", current time " << msecs() << ", to wait: " << end_time - msecs()); is_timeout = false; if((flags & WAIT_READ) && ptr != end) return true; @@ -620,6 +620,7 @@ bool TcpSocket::RawWait(dword flags, int end_time) tval.tv_sec = to / 1000; tval.tv_usec = 1000 * (to % 1000); tvalp = &tval; + LLOG("RawWait timeout: " << to); } fd_set fdsetr[1], fdsetw[1], fdsetx[1];; FD_ZERO(fdsetr);