add EWOULDBLOCK to fix Windows; close #138

terminateden · Jul 4, 2014 · 13436b2 · 13436b2
1 parent d82441e
commit 13436b2
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/shadowsocks/tcprelay.py b/shadowsocks/tcprelay.py
@@ -166,7 +166,8 @@ def _write_to_sock(self, data, sock):
                 uncomplete = True
         except (OSError, IOError) as e:
             error_no = eventloop.errno_from_exception(e)
-            if error_no in (errno.EAGAIN, errno.EINPROGRESS):
+            if error_no in (errno.EAGAIN, errno.EINPROGRESS,
+                            errno.EWOULDBLOCK):
                 uncomplete = True
             else:
                 logging.error(e)
@@ -349,7 +350,7 @@ def _on_local_read(self):
             data = self._local_sock.recv(BUF_SIZE)
         except (OSError, IOError) as e:
             if eventloop.errno_from_exception(e) in \
-                    (errno.ETIMEDOUT, errno.EAGAIN):
+                    (errno.ETIMEDOUT, errno.EAGAIN, errno.EWOULDBLOCK):
                 return
         if not data:
             self.destroy()
@@ -381,7 +382,7 @@ def _on_remote_read(self):
             data = self._remote_sock.recv(BUF_SIZE)
         except (OSError, IOError) as e:
             if eventloop.errno_from_exception(e) in \
-                    (errno.ETIMEDOUT, errno.EAGAIN):
+                    (errno.ETIMEDOUT, errno.EAGAIN, errno.EWOULDBLOCK):
                 return
         if not data:
             self.destroy()
@@ -610,7 +611,8 @@ def _handle_events(self, events):
                                     self._is_local)
                 except (OSError, IOError) as e:
                     error_no = eventloop.errno_from_exception(e)
-                    if error_no in (errno.EAGAIN, errno.EINPROGRESS):
+                    if error_no in (errno.EAGAIN, errno.EINPROGRESS,
+                                    errno.EWOULDBLOCK):
                         continue
                     else:
                         logging.error(e)