Commits

Robert Brewer committed 8947293

Fix for #877 (Bug in recv wsgiserver).

Comments (0)

Files changed (1)

cherrypy/wsgiserver/__init__.py

                 try:
                     return self._sock.recv(size)
                 except socket.error, e:
-                    if e.args[0] not in socket_errors_nonblocking:
+                    if (e.args[0] not in socket_errors_nonblocking
+                        and e.args[0] not in socket_error_eintr):
                         raise
 
         def read(self, size=-1):
                 try:
                     return self._sock.recv(size)
                 except socket.error, e:
-                    if e.args[0] not in socket_errors_nonblocking:
+                    if (e.args[0] not in socket_errors_nonblocking
+                        and e.args[0] not in socket_error_eintr):
                         raise
 
         def read(self, size=-1):