fs  committed b91303a

merge r1766 into 2.3.x branch

  • Participants
  • Parent commits 99b3b00
  • Branches cherrypy-2.x

Comments (0)

Files changed (1)

File cherrypy/

             # accept() by default
         except socket.error, x:
+            if hasattr(errno, "EINTR") and x.args[0] == errno.EINTR:
+                # I *think* this is right. EINTR should occur when a signal
+                # is received during the accept() call; all docs say retry
+                # the call, and I *think* I'm reading it right that Python
+                # will then go ahead and poll for and handle the signal
+                # elsewhere. See
+                return
             msg = x.args[1]
             if msg == "Bad file descriptor":
                 # Our socket was closed