From: Jeff Hodsdon <jeffhodsdon@gmail.com>
Date: Wed, 31 Aug 2011 02:05:55 +0000 (-0700)
Subject: Corrected on_connect timeout for simplehttpclient
X-Git-Tag: v2.1.0~35^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=525b5da597153670861a1136c7c4abfffb4ada08;p=thirdparty%2Ftornado.git

Corrected on_connect timeout for simplehttpclient
---

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index d32809a51..758f2f3f7 100644
--- 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(