Merge remote branch 'vijayp/master'

2010-11-18 11:26:14 -08:00 · 2010-11-18 11:26:14 -08:00 · cb232b22da
parent d0620d6718 905a215a28
commit cb232b22da
1 changed files with 2 additions and 0 deletions
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@ -554,6 +554,8 @@ def _curl_setup_request(curl, request, buffer, headers):
            credentials = '%s:%s' % (request.proxy_username,
                    request.proxy_password)
            curl.setopt(pycurl.PROXYUSERPWD, credentials)
+    else:
+        curl.setopt(pycurl.PROXY, '')

    # Set the request method through curl's retarded interface which makes
    # up names for almost every single method