Merge remote-tracking branch 'grydstedt/master' into work

tornadoweb · Feb 20, 2012 · 9431921 · 9431921
2 parents ceabffe + 1157a55
commit 9431921
Showing 1 changed file with 5 additions and 2 deletions.
diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
@@ -395,8 +395,11 @@ def ioctl(cmd):
         curl.unsetopt(pycurl.USERPWD)
         logging.debug("%s %s", request.method, request.url)
 
-    if request.client_key is not None or request.client_cert is not None:
-        raise ValueError("Client certificate not supported with curl_httpclient")
+    if request.client_cert is not None:
+        curl.setopt(pycurl.SSLCERT, request.client_cert)
+
+    if request.client_key is not None:
+        curl.setopt(pycurl.SSLKEY, request.client_key)
 
     if threading.activeCount() > 1:
         # libcurl/pycurl is not thread-safe by default.  When multiple threads