Merge commit 'df23c'

bdarnell · bdarnell · commit 9a8e5e4d86da · 2012-01-23T10:12:56.000-08:00
diff --git a/tornado/curl_httpclient.py b/tornado/curl_httpclient.py
@@ -383,10 +383,10 @@ def ioctl(cmd):
         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, utf8(userpwd))
         logging.debug("%s %s (username: %r)", request.method, request.url,
                       request.auth_username)
     else:
