Fix header overriding in build response

dymmond · Feb 12, 2025 · 97cdc95 · 97cdc95
1 parent 345492e
commit 97cdc95
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/docs/en/docs/release-notes.md b/docs/en/docs/release-notes.md
@@ -18,6 +18,10 @@ system.
 
 - [Permissions section](./permissions/esmerald.md) moved and renamed to Esmerald Permissions.
 
+### Fixed
+
+- `set_cookie` was causing an issue when multiple were being generated.
+
 ### 3.6.4
 
 ### Added

diff --git a/esmerald/routing/base.py b/esmerald/routing/base.py
@@ -297,7 +297,7 @@ async def response_content(
             app: Type["Esmerald"],
             **kwargs: Dict[str, Any],
         ) -> LilyaResponse:
-            _headers = {**self.get_headers(headers), **data.headers}
+            _headers = {**self.get_headers(headers), **data.headers.dump()}
             _cookies = self.get_cookies(data.cookies, cookies)
             if isinstance(data, LilyaResponse):
                 response: LilyaResponse = data
@@ -338,7 +338,6 @@ async def response_content(data: Response, **kwargs: Dict[str, Any]) -> LilyaRes
             _cookies = self.get_cookies(cookies)
             _headers = {
                 **self.get_headers(headers),
-                **data.headers,
                 **self.allow_header,
             }
             for cookie in _cookies:
@@ -373,7 +372,6 @@ async def response_content(data: Response, **kwargs: Dict[str, Any]) -> LilyaRes
             _cookies = self.get_cookies(data.cookies, cookies)
             _headers = {
                 **self.get_headers(headers),
-                **data.headers,
                 **self.allow_header,
             }
             for cookie in _cookies:
@@ -410,7 +408,6 @@ async def response_content(data: LilyaResponse, **kwargs: Dict[str, Any]) -> Lil
             _cookies = self.get_cookies(cookies)
             _headers = {
                 **self.get_headers(headers),
-                **data.headers,
                 **self.allow_header,
             }
             for cookie in _cookies: