Corrected on_connect timeout for simplehttpclient

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index d32809a515c5fc4ec97e70e051f5688517cfa81c..758f2f3f78109372dd66b0d165f83d5bea94c2a5 100644 (file)
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -196,7 +196,7 @@ class _HTTPConnection(object):
                                        max_buffer_size=max_buffer_size)
             timeout = min(request.connect_timeout, request.request_timeout)
             if timeout:
-                self._connect_timeout = self.io_loop.add_timeout(
+                self._timeout = self.io_loop.add_timeout(
                     self.start_time + timeout,
                     self._on_timeout)
             self.stream.set_close_callback(self._on_close)
@@ -212,7 +212,7 @@ class _HTTPConnection(object):
 
     def _on_connect(self, parsed):
         if self._timeout is not None:
-            self.io_loop.remove_callback(self._timeout)
+            self.io_loop.remove_timeout(self._timeout)
             self._timeout = None
         if self.request.request_timeout:
             self._timeout = self.io_loop.add_timeout(