]> git.ipfire.org Git - thirdparty/tornado.git/commitdiff
fix curl basic auth
authordave mankoff <mankyd@gmail.com>
Sun, 22 Jan 2012 22:15:10 +0000 (17:15 -0500)
committerdave mankoff <mankyd@gmail.com>
Sun, 22 Jan 2012 22:15:10 +0000 (17:15 -0500)
tornado/curl_httpclient.py

index 8dfcb4a8342b11b9e18ad006f9ba75b03c2e47ec..7d8faf36e201ec46b12498ea9bdc2ffe525d25d2 100644 (file)
@@ -383,10 +383,10 @@ def _curl_setup_request(curl, request, buffer, headers):
         else:
             curl.setopt(pycurl.INFILESIZE, len(request.body))
 
-    if request.auth_username and request.auth_password:
-        userpwd = "%s:%s" % (request.auth_username, request.auth_password)
+    if request.auth_username is not None:
+        userpwd = "%s:%s" % (request.auth_username, request.auth_password or '')
         curl.setopt(pycurl.HTTPAUTH, pycurl.HTTPAUTH_BASIC)
-        curl.setopt(pycurl.USERPWD, userpwd)
+        curl.setopt(pycurl.USERPWD, userpwd.encode('ascii'))
         logging.debug("%s %s (username: %r)", request.method, request.url,
                       request.auth_username)
     else: