Support non-integer timeouts for curl_httpclient.

Closes #399.

diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
index 53824c84b238b70c4cbd37b7de400ed12568892c..8dfcb4a8342b11b9e18ad006f9ba75b03c2e47ec 100644 (file)
--- 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 ceefc741c9a5603511a333cffe996752a8bd7515..aec6654b8ce9910a1892913b107d9274006d9d42 100644 (file)
--- 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.