Permalink
Browse files

Merge pull request #552 from vigasin/master

Fix SSL error handling bug that could result in 100% cpu usage.

Possibly platform-specific; observed on windows.
  • Loading branch information...
2 parents b04e5b6 + 32017dc commit ff12f2950650dcf547d0b8f8f5384161b604dbbc @bdarnell bdarnell committed Jun 29, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 tornado/iostream.py
View
@@ -654,7 +654,7 @@ def _do_ssl_handshake(self):
return self.close()
raise
except socket.error, err:
- if err.args[0] == errno.ECONNABORTED:
+ if err.args[0] in (errno.ECONNABORTED, errno.ECONNRESET):
return self.close()
else:
self._ssl_accepting = False

0 comments on commit ff12f29

Please sign in to comment.