Update Tornado

2015-01-11 16:18:22 +01:00
parent e1e39cd3f4
commit 1510e37652
13 changed files with 52 additions and 48 deletions
@@ -193,12 +193,8 @@ class _HTTPConnection(httputil.HTTPMessageDelegate):
            netloc = self.parsed.netloc
            if "@" in netloc:
                userpass, _, netloc = netloc.rpartition("@")
-            match = re.match(r'^(.+):(\d+)$', netloc)
-            if match:
-                host = match.group(1)
-                port = int(match.group(2))
-            else:
-                host = netloc
+            host, port = httputil.split_host_and_port(netloc)
+            if port is None:
                port = 443 if self.parsed.scheme == "https" else 80
            if re.match(r'^\[.*\]$', host):
                # raw ipv6 addresses in urls are enclosed in brackets