Merge branch 'master' into handle-stream-native-coro

tornado/netutil.py

@@ -96,6 +96,9 @@
 # thread now.
 u'foo'.encode('idna')
 
+# For undiagnosed reasons, 'latin1' codec may also need to be preloaded.
+u'foo'.encode('latin1')
+
 # These errnos indicate that a non-blocking operation must be retried
 # at a later time.  On most platforms they're the same value, but on
 # some they differ.

tornado/platform/common.py

@@ -6,7 +6,7 @@
 import time
 
 from tornado.platform import interface
-
+from tornado.util import errno_from_exception
 
 def try_close(f):
     # Avoid issue #875 (race condition when using the file in another
@@ -61,7 +61,7 @@ def __init__(self):
                 break    # success
             except socket.error as detail:
                 if (not hasattr(errno, 'WSAEADDRINUSE') or
-                        detail[0] != errno.WSAEADDRINUSE):
+                        errno_from_exception(detail) != errno.WSAEADDRINUSE):
                     # "Address already in use" is the only error
                     # I've seen on two WinXP Pro SP2 boxes, under
                     # Pythons 2.3.5 and 2.4.1.

tornado/tcpserver.py

@@ -110,6 +110,7 @@ def __init__(self, io_loop=None, ssl_options=None, max_buffer_size=None,
         self._sockets = {}  # fd -> socket object
         self._pending_sockets = []
         self._started = False
+        self._stopped = False
         self.max_buffer_size = max_buffer_size
         self.read_chunk_size = read_chunk_size
 
@@ -228,7 +229,11 @@ def stop(self):
         Requests currently in progress may still continue after the
         server is stopped.
         """
+        if self._stopped:
+            return
+        self._stopped = True
         for fd, sock in self._sockets.items():
+            assert sock.fileno() == fd
             self.io_loop.remove_handler(fd)
             sock.close()
 

tornado/test/tcpserver_test.py

@@ -1,4 +1,5 @@
 from __future__ import absolute_import, division, print_function, with_statement
+
 import socket
 
 from tornado import gen
@@ -60,3 +61,11 @@ async def handle_stream(self, stream, address):
         self.assertEqual(result, b'data')
         server.stop()
         client.close()
+
+    def test_stop_twice(self):
+        sock, port = bind_unused_port()
+        server = TCPServer()
+        server.add_socket(sock)
+        server.stop()
+        server.stop()
+