]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
Set both VERIFYPEER and VERIFYHOST according to the validate_cert setting.
authorBen Darnell <ben@bendarnell.com>
Sat, 19 Feb 2011 22:29:35 +0000 (14:29 -0800)
committerBen Darnell <ben@bendarnell.com>
Sat, 19 Feb 2011 22:29:35 +0000 (14:29 -0800)
tornado/httpclient.py

index e6c6baa6cb570567d07e89df736f7592d64b3169..62b2f64a32c218c0212850b6361414836a5b0582 100644 (file)
@@ -568,7 +568,12 @@ def _curl_setup_request(curl, request, buffer, headers):
             curl.setopt(pycurl.PROXYUSERPWD, credentials)
     else:
         curl.setopt(pycurl.PROXY, '')
-    curl.setopt(pycurl.SSL_VERIFYPEER, request.validate_cert)
+    if request.validate_cert:
+        curl.setopt(pycurl.SSL_VERIFYPEER, 1)
+        curl.setopt(pycurl.SSL_VERIFYHOST, 2)
+    else:
+        curl.setopt(pycurl.SSL_VERIFYPEER, 0)
+        curl.setopt(pycurl.SSL_VERIFYHOST, 0)
     if request.ca_certs is not None:
         curl.setopt(pycurl.CAINFO, request.ca_certs)
     else: