From: Martin von Gagern <Martin.vGagern@gmx.net>
Date: Wed, 28 Aug 2013 20:41:53 +0000 (+0200)
Subject: Remove disabled code, and test for backslash removal.
X-Git-Tag: v5.1.0b1~5^2~1^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5b8189023622c1849f6615e61b72b929d72d91d1;p=thirdparty%2Ftornado.git

Remove disabled code, and test for backslash removal.
---

diff --git a/tornado/httputil.py b/tornado/httputil.py
index e5b42d8de..8ccf8a757 100644
--- a/tornado/httputil.py
+++ b/tornado/httputil.py
@@ -424,11 +424,12 @@ def _parse_header(line):
 
     Return the main content-type and a dictionary of options.
 
-    >>> d = _parse_header("CD: fd; foo=\"bar\"; file*=utf-8''T%C3%A4st")[1]
+    >>> d = "CD: fd; foo=\"b\\\\a\\\"r\"; file*=utf-8''T%C3%A4st"
+    >>> d = _parse_header(d)[1]
     >>> d['file'] == r'T\u00e4st'.encode('ascii').decode('unicode_escape')
     True
     >>> d['foo']
-    'bar'
+    'b\\a"r'
     """
     parts = _parseparam(';' + line)
     key = next(parts)
@@ -439,9 +440,6 @@ def _parse_header(line):
         if i >= 0:
             name = p[:i].strip().lower()
             value = p[i + 1:].strip()
-            if len(value) >= 2 and value[0] == value[-1] == '"' and False:
-                value = value[1:-1]
-                value = value.replace('\\\\', '\\').replace('\\"', '"')
             params.append((name, value))
     params = email.utils.decode_params(params)
     params.pop(0) # get rid of the dummy again