From 2ac7426855dd06ee6daad69985d6ad5f62b26437 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Mon, 28 Jun 2010 09:52:46 -0700 Subject: [PATCH] UTF8-encode more user-supplied strings in httpclient (headers and user-agent) --- tornado/httpclient.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tornado/httpclient.py b/tornado/httpclient.py index e551bbf9f..4d29da66f 100644 --- a/tornado/httpclient.py +++ b/tornado/httpclient.py @@ -619,7 +619,7 @@ def _curl_create(max_simultaneous_connections=None): def _curl_setup_request(curl, request, buffer, headers): curl.setopt(pycurl.URL, request.url) curl.setopt(pycurl.HTTPHEADER, - ["%s: %s" % i for i in request.headers.iteritems()]) + [_utf8("%s: %s" % i) for i in request.headers.iteritems()]) if request.header_callback: curl.setopt(pycurl.HEADERFUNCTION, request.header_callback) else: @@ -634,7 +634,7 @@ def _curl_setup_request(curl, request, buffer, headers): curl.setopt(pycurl.CONNECTTIMEOUT, int(request.connect_timeout)) curl.setopt(pycurl.TIMEOUT, int(request.request_timeout)) if request.user_agent: - curl.setopt(pycurl.USERAGENT, request.user_agent) + curl.setopt(pycurl.USERAGENT, _utf8(request.user_agent)) else: curl.setopt(pycurl.USERAGENT, "Mozilla/5.0 (compatible; pycurl)") if request.network_interface: -- 2.47.2