]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Quiet another error that can be caused by port scans.
authorBen Darnell <ben@bendarnell.com>
Sun, 27 Sep 2015 17:05:58 +0000 (13:05 -0400)
committerBen Darnell <ben@bendarnell.com>
Sun, 27 Sep 2015 17:05:58 +0000 (13:05 -0400)
tornado/iostream.py

index c5d3e2c9dc3418ec2817a2f8553be1cbfcf3e936..1e67710458c3874786bc05a60f16c957eedfdd79 100644 (file)
@@ -1274,10 +1274,11 @@ class SSLIOStream(IOStream):
             raise
         except socket.error as err:
             # Some port scans (e.g. nmap in -sT mode) have been known
-            # to cause do_handshake to raise EBADF, so make that error
-            # quiet as well.
+            # to cause do_handshake to raise EBADF and ENOTCONN, so make
+            # those errors quiet as well.
             # https://groups.google.com/forum/?fromgroups#!topic/python-tornado/ApucKJat1_0
-            if self._is_connreset(err) or err.args[0] == errno.EBADF:
+            if (self._is_connreset(err) or
+                err.args[0] in (errno.EBADF, errno.ENOTCONN)):
                 return self.close(exc_info=True)
             raise
         except AttributeError: