From c91ac2a120e202a9d15cb62f18956946d650f75e Mon Sep 17 00:00:00 2001
From: Oleksii Shevchuk <alxchk@gmail.com>
Date: Sun, 28 Aug 2016 14:20:30 +0300
Subject: [PATCH] Don't stay in loop if socket is closed

---
 pupy/network/lib/streams/PupySocketStream.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pupy/network/lib/streams/PupySocketStream.py b/pupy/network/lib/streams/PupySocketStream.py
index 710cd6f0..5fde5184 100644
--- a/pupy/network/lib/streams/PupySocketStream.py
+++ b/pupy/network/lib/streams/PupySocketStream.py
@@ -1,4 +1,4 @@
-# -*- coding: UTF8 -*-
+# -*- coding: utf-8 -*-
 # Copyright (c) 2015, Nicolas VERDIER (contact@n1nj4.eu)
 # Pupy is under the BSD 3-Clause license. see the LICENSE file at the root of the project for the detailed licence terms
 """ abstraction layer over rpyc streams to handle different transports and integrate obfsproxy pluggable transports """
@@ -92,7 +92,9 @@ class PupySocketStream(SocketStream):
             if len(self.upstream)>=count:
                 return self.upstream.read(count)
             while len(self.upstream)<count:
-                self.sock_poll(0.1)
+                if not self.sock_poll(0.1) and self.closed:
+                    return None
+
                 #self._read()
 
                 #it seems we can actively wait here with only perf enhancement
@@ -208,5 +210,3 @@ class PupyUDPSocketStream(object):
             #The write will be done by the _upstream_recv callback on the downstream buffer
         except Exception as e:
             logging.debug(traceback.format_exc())
-
-