From: Ben Darnell <ben@bendarnell.com>
Date: Sat, 14 Jan 2012 07:12:39 +0000 (-0800)
Subject: Support non-integer timeouts for curl_httpclient.
X-Git-Tag: v2.2.0~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=36226505bae80160add2acc67cc516bff79559f6;p=thirdparty%2Ftornado.git

Support non-integer timeouts for curl_httpclient.

Closes #399.
---

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index 53824c84b..8dfcb4a83 100644
--- a/tornado/curl_httpclient.py
+++ b/tornado/curl_httpclient.py
@@ -307,8 +307,8 @@ def _curl_setup_request(curl, request, buffer, headers):
         curl.setopt(pycurl.WRITEFUNCTION, buffer.write)
     curl.setopt(pycurl.FOLLOWLOCATION, request.follow_redirects)
     curl.setopt(pycurl.MAXREDIRS, request.max_redirects)
-    curl.setopt(pycurl.CONNECTTIMEOUT, int(request.connect_timeout))
-    curl.setopt(pycurl.TIMEOUT, int(request.request_timeout))
+    curl.setopt(pycurl.CONNECTTIMEOUT_MS, int(1000 * request.connect_timeout))
+    curl.setopt(pycurl.TIMEOUT_MS, int(1000 * request.request_timeout))
     if request.user_agent:
         curl.setopt(pycurl.USERAGENT, utf8(request.user_agent))
     else:
diff --git a/website/sphinx/releases/next.rst b/website/sphinx/releases/next.rst
index ceefc741c..aec6654b8 100644
--- a/website/sphinx/releases/next.rst
+++ b/website/sphinx/releases/next.rst
@@ -85,3 +85,4 @@ Other modules
   duplicate addresses.
 * `tornado.version_info` is now a four-tuple so official releases can be
   distinguished from development branches.
+* `tornado.curl_httpclient` now accepts non-integer timeouts.