From 513e4218e6aa509a5060eaacc723d77153b73893 Mon Sep 17 00:00:00 2001 From: upstream svn Date: Sat, 2 Jan 2021 15:22:57 +0000 Subject: [PATCH] proxy: avoid redundant assignment --- .svn-revision | 2 +- src/Proxy.cpp | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.svn-revision b/.svn-revision index 356118b7..1666dfd8 100644 --- a/.svn-revision +++ b/.svn-revision @@ -1 +1 @@ -11070 +11071 diff --git a/src/Proxy.cpp b/src/Proxy.cpp index 88c120ca..5ac0c43b 100644 --- a/src/Proxy.cpp +++ b/src/Proxy.cpp @@ -338,7 +338,9 @@ uint32 CProxyStateMachine::ProxyRead(CLibSocket &socket, void *buffer) m_ok = true; if (m_proxyClientSocket->BlocksRead()) { m_lastError = 0; +#ifndef ASIO_SOCKETS // m_canReceive is already assigned later m_canReceive = false; +#endif } else if ((m_lastError = m_proxyClientSocket->LastError()) != 0) { m_ok = false; } -- 2.11.4.GIT