More defensiveness about patterns that could lead to double callbacks.

diff --git a/tornado/simple_httpclient.py b/tornado/simple_httpclient.py
index c684e745da5550bab28d088adb5e6ba852b8044e..c0d76aa66369cdc393ff1649499fa92186449ed2 100644 (file)
--- a/tornado/simple_httpclient.py
+++ b/tornado/simple_httpclient.py
@@ -204,10 +204,8 @@ class _HTTPConnection(object):
 
     def _on_timeout(self):
         self._timeout = None
-        if self.callback is not None:
-            self.callback(HTTPResponse(self.request, 599,
-                                       error=HTTPError(599, "Timeout")))
-            self.callback = None
+        self._run_callback(HTTPResponse(self.request, 599,
+                                        error=HTTPError(599, "Timeout")))
         self.stream.close()
 
     def _on_connect(self, parsed):
@@ -348,8 +346,9 @@ class _HTTPConnection(object):
             new_request.max_redirects -= 1
             del new_request.headers["Host"]
             new_request.original_request = original_request
-            self.client.fetch(new_request, self.callback)
+            callback = self.callback
             self.callback = None
+            self.client.fetch(new_request, callback)
             return
         response = HTTPResponse(original_request,
                                 self.code, headers=self.headers,