aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAldo Cortesi <aldo@corte.si>2016-06-06 08:45:35 +1200
committerAldo Cortesi <aldo@corte.si>2016-06-06 08:45:35 +1200
commit08344ee38b1311b60afc906296f4720de748c945 (patch)
tree245d5924f8ba4dbdc241004b3a68832518a38a97
parentc31b9c461dd4f905dcdb3f127c54d561a6166bb9 (diff)
parent25505733bc2830a5beffd84adba7e6e6d45e9f07 (diff)
downloadmitmproxy-08344ee38b1311b60afc906296f4720de748c945.tar.gz
mitmproxy-08344ee38b1311b60afc906296f4720de748c945.tar.bz2
mitmproxy-08344ee38b1311b60afc906296f4720de748c945.zip
Merge pull request #1215 from redfast00/master
Now keeps header capitalization
-rw-r--r--netlib/multidict.py2
-rw-r--r--test/netlib/test_multidict.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/netlib/multidict.py b/netlib/multidict.py
index dc0f3466..982a1178 100644
--- a/netlib/multidict.py
+++ b/netlib/multidict.py
@@ -105,7 +105,7 @@ class _MultiDict(MutableMapping, basetypes.Serializable):
if self._kconv(field[0]) == key_kconv:
if values:
new_fields.append(
- (key, values.pop(0))
+ (field[0], values.pop(0))
)
else:
new_fields.append(field)
diff --git a/test/netlib/test_multidict.py b/test/netlib/test_multidict.py
index 7319f1c5..a35d5cc5 100644
--- a/test/netlib/test_multidict.py
+++ b/test/netlib/test_multidict.py
@@ -120,7 +120,7 @@ class TestMultiDict(object):
("a", "b"),
("x", "x"),
("c", "d"),
- ("X", "x"),
+ ("X", "X"),
("e", "f"),
))
md.set_all("x", ["1", "2", "3"])
@@ -128,7 +128,7 @@ class TestMultiDict(object):
("a", "b"),
("x", "1"),
("c", "d"),
- ("x", "2"),
+ ("X", "2"),
("e", "f"),
("x", "3"),
)