From: Marc Schlaich <marc.schlaich@googlemail.com>
Date: Tue, 22 Jan 2013 08:33:03 +0000 (+0100)
Subject: Update tornado/netutil.py
X-Git-Tag: v3.0.0~155^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F670%2Fhead;p=thirdparty%2Ftornado.git

Update tornado/netutil.py

`socket.getadrrinfo` yields some strange output if Python is compiled with `--disable-ipv6`, resulting in a `bad family` error.
See http://bugs.python.org/issue16208
---

diff --git a/tornado/netutil.py b/tornado/netutil.py
index a3e956868..0d711d4d9 100644
--- a/tornado/netutil.py
+++ b/tornado/netutil.py
@@ -53,6 +53,8 @@ def bind_sockets(port, address=None, family=socket.AF_UNSPEC, backlog=128, flags
     sockets = []
     if address == "":
         address = None
+    if not socket.has_ipv6:
+        family = socket.AF_INET
     if flags is None:
         flags = socket.AI_PASSIVE
     for res in set(socket.getaddrinfo(address, port, family, socket.SOCK_STREAM,