Merge pull request #1828 from Miserlou/bugfix/repeated-values-on-headers

Fix for repeated values on headers
Miserlou · Mar 20, 2019 · b741420 · b741420
2 parents d58b6f9 + 875ffd0
commit b741420
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/tests/test_handler.py b/tests/test_handler.py
@@ -402,7 +402,7 @@ def test_merge_headers_combine_values(self):
         }
 
         merged = merge_headers(event)
-        self.assertEqual(merged['a'], 'c, b')
+        self.assertEqual(merged['a'], 'c')
         self.assertEqual(merged['x'], 'y')
         self.assertEqual(merged['z'], 'q')
 

diff --git a/zappa/utilities.py b/zappa/utilities.py
@@ -569,10 +569,9 @@ def merge_headers(event):
     """
     headers = event.get('headers') or {}
     multi_headers = (event.get('multiValueHeaders') or {}).copy()
-    for h in (set(multi_headers.keys()) | set(headers.keys())):
+    for h in set(headers.keys()):
         if h not in multi_headers:
             multi_headers[h] = [headers[h]]
-        elif h in headers:
-            multi_headers[h].append(headers[h])
+    for h in multi_headers.keys():
         multi_headers[h] = ', '.join(multi_headers[h])
     return multi_headers