From f9b406d0fb99e8fbf5607901d924281154df0e25 Mon Sep 17 00:00:00 2001 From: Weeblr Date: Sun, 3 Apr 2022 17:52:22 +0200 Subject: [PATCH 1/2] Application setHeader() does not respect $replace option The setHeader() method causes the last header set to always be output even if $replace is set to false. --- src/AbstractWebApplication.php | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/AbstractWebApplication.php b/src/AbstractWebApplication.php index ddce5a39..49b4af46 100644 --- a/src/AbstractWebApplication.php +++ b/src/AbstractWebApplication.php @@ -571,6 +571,11 @@ public function setHeader($name, $value, $replace = false) $response = $response->withoutHeader($name); } + if (!$replace && $response->hasHeader($name)) + { + return $this; + } + // Add the header to the internal array. $this->setResponse($response->withAddedHeader($name, $value)); From a631433c65fc5e9a9815b2e4ee2b7a99e131309f Mon Sep 17 00:00:00 2001 From: Weeblr Date: Sun, 3 Apr 2022 18:05:17 +0200 Subject: [PATCH 2/2] Style: spaces after end of lines --- src/AbstractWebApplication.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/AbstractWebApplication.php b/src/AbstractWebApplication.php index 49b4af46..88556209 100644 --- a/src/AbstractWebApplication.php +++ b/src/AbstractWebApplication.php @@ -575,7 +575,7 @@ public function setHeader($name, $value, $replace = false) { return $this; } - + // Add the header to the internal array. $this->setResponse($response->withAddedHeader($name, $value));