From: Andrew Grigorev <ei-grad@yandex-team.ru>
Date: Mon, 30 Jan 2012 04:12:24 +0000 (+0400)
Subject: fixed usage of bad hostname (ipv6 addresses support is broken in urlparse until 2.7)
X-Git-Tag: v2.3.0~94^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=42656e693897ebc3adf53616c2633f464d824349;p=thirdparty%2Ftornado.git

fixed usage of bad hostname (ipv6 addresses support is broken in urlparse until 2.7)
---

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 376d410c5..09293efaf 100644
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -162,6 +162,7 @@ class _HTTPConnection(object):
                 host = host[1:-1]
             if self.client.hostname_mapping is not None:
                 host = self.client.hostname_mapping.get(host, host)
+            parsed._hostname = host # save correct hostname for _on_connect
 
             if request.allow_ipv6:
                 af = socket.AF_UNSPEC
@@ -241,7 +242,9 @@ class _HTTPConnection(object):
         if (self.request.validate_cert and
             isinstance(self.stream, SSLIOStream)):
             match_hostname(self.stream.socket.getpeercert(),
-                           parsed.hostname)
+                           # ipv6 addresses are broken until 2.7, here is
+                           # correctly parsed value calculated in __init__
+                           parsed._hostname)
         if (self.request.method not in self._SUPPORTED_METHODS and
             not self.request.allow_nonstandard_methods):
             raise KeyError("unknown method %s" % self.request.method)