fixes

Miserlou · Mar 19, 2019 · 875ffd0 · 875ffd0
1 parent 7f93e6f
commit 875ffd0
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
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
@@ -572,5 +572,6 @@ def merge_headers(event):
     for h in set(headers.keys()):
         if h not in multi_headers:
             multi_headers[h] = [headers[h]]
+    for h in multi_headers.keys():
         multi_headers[h] = ', '.join(multi_headers[h])
     return multi_headers