From: Ben Darnell <ben@bendarnell.com>
Date: Mon, 6 Dec 2010 01:07:46 +0000 (-0800)
Subject: Add a simple mechanism to override DNS lookups in SimpleAsyncHTTPClient.
X-Git-Tag: v1.2.0~30
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e965299b9e594a6a063cf0efbe4da60f33d5371a;p=thirdparty%2Ftornado.git

Add a simple mechanism to override DNS lookups in SimpleAsyncHTTPClient.

Intended for use in SSL unittests, where we will need to make requests to
localhost using different domain names.
---

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index 5819a0cd1..8fa4e7e28 100644
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -49,7 +49,8 @@ class SimpleAsyncHTTPClient(object):
 
     def __new__(cls, io_loop=None, max_clients=10,
                 max_simultaneous_connections=None,
-                force_instance=False):
+                force_instance=False,
+                hostname_mapping=None):
         """Creates a SimpleAsyncHTTPClient.
 
         Only a single SimpleAsyncHTTPClient instance exists per IOLoop
@@ -61,6 +62,11 @@ class SimpleAsyncHTTPClient(object):
         only for compatibility with the curl-based AsyncHTTPClient.  Note
         that these arguments are only used when the client is first created,
         and will be ignored when an existing client is reused.
+
+        hostname_mapping is a dictionary mapping hostnames to IP addresses.
+        It can be used to make local DNS changes when modifying system-wide
+        settings like /etc/hosts is not possible or desirable (e.g. in
+        unittests).
         """
         io_loop = io_loop or IOLoop.instance()
         if io_loop in cls._ASYNC_CLIENTS and not force_instance:
@@ -71,6 +77,7 @@ class SimpleAsyncHTTPClient(object):
             instance.max_clients = max_clients
             instance.queue = collections.deque()
             instance.active = {}
+            instance.hostname_mapping = hostname_mapping
             if not force_instance:
                 cls._ASYNC_CLIENTS[io_loop] = instance
             return instance
@@ -97,7 +104,7 @@ class SimpleAsyncHTTPClient(object):
                 request, callback = self.queue.popleft()
                 key = object()
                 self.active[key] = (request, callback)
-                _HTTPConnection(self.io_loop, request,
+                _HTTPConnection(self.io_loop, self, request,
                                 functools.partial(self._on_fetch_complete,
                                                   key, callback))
 
@@ -111,9 +118,10 @@ class SimpleAsyncHTTPClient(object):
 class _HTTPConnection(object):
     _SUPPORTED_METHODS = set(["GET", "HEAD", "POST", "PUT", "DELETE"])
 
-    def __init__(self, io_loop, request, callback):
+    def __init__(self, io_loop, client, request, callback):
         self.start_time = time.time()
         self.io_loop = io_loop
+        self.client = client
         self.request = request
         self.callback = callback
         self.code = None
@@ -130,6 +138,8 @@ class _HTTPConnection(object):
             else:
                 host = parsed.netloc
                 port = 443 if parsed.scheme == "https" else 80
+            if self.client.hostname_mapping is not None:
+                host = self.client.hostname_mapping.get(host, host)
 
             if parsed.scheme == "https":
                 # TODO: cert verification, etc