Combine repeated headers with the same name into a single comma-separated string

http://www.w3.org/Protocols/HTTP/1.0/spec.html#Message-Headers

diff --git a/tornado/httpclient.py b/tornado/httpclient.py
index a67a3c5c605f005e1580b650cd93931e4be50f8f..e65ed40ecb1cc32751ebbb4d7ad1dec1ab8d8a3f 100644 (file)
--- a/tornado/httpclient.py
+++ b/tornado/httpclient.py
@@ -421,7 +421,12 @@ def _curl_header_callback(headers, header_line):
     if len(parts) != 2:
         logging.warning("Invalid HTTP response header line %r", header_line)
         return
-    headers[parts[0].strip()] = parts[1].strip()
+    name = parts[0].strip()
+    value = parts[1].strip()
+    if name in headers:
+        headers[name] = headers[name] + ',' + value
+    else:
+        headers[name] = value
 
 
 def _curl_debug(debug_type, debug_msg):