Skip to content

Commit

Permalink
Merge pull request #552 from vigasin/master
Browse files Browse the repository at this point in the history
Fix SSL error handling bug that could result in 100% cpu usage.

Possibly platform-specific; observed on windows.
  • Loading branch information
bdarnell committed Jun 29, 2012
2 parents b04e5b6 + 32017dc commit ff12f29
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion tornado/iostream.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit ff12f29

Please sign in to comment.