Fix Issue codeigniter4#5041 - Bug: CURLRequest keeps the last value p…

…rovided by headers with the same name CURLRequest can now get and forward all headers including multiple headers with the same name
NicolaeIotu · Oct 19, 2021 · ab9272f · ab9272f
1 parent 5290051
commit ab9272f
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 2 deletions.
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -236,7 +236,12 @@ protected function parseOptions(array $options)
 
         if (array_key_exists('headers', $options) && is_array($options['headers'])) {
             foreach ($options['headers'] as $name => $value) {
-                $this->setHeader($name, $value);
+                // fix issue #5041 by taking into account multiple headers with the same name
+                if($this->hasHeader($name)) {
+                    $this->appendHeader($name, $value);
+                } else {
+                    $this->setHeader($name, $value);
+                }
             }
 
             unset($options['headers']);

diff --git a/system/HTTP/ResponseTrait.php b/system/HTTP/ResponseTrait.php
@@ -468,7 +468,15 @@ public function sendHeaders()
 
         // Send all of our headers
         foreach (array_keys($this->getHeaders()) as $name) {
-            header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
+            // fix issue #5041 by taking into account multiple headers with the same name
+            $headerValue = $this->getHeader($name)->getValue();
+            if(is_array($headerValue)) {
+                foreach($headerValue as $h_value) {
+                    header($name . ': ' . $h_value, false, $this->getStatusCode());
+                }
+            } else {
+                header($name . ': ' . $this->getHeaderLine($name), false, $this->getStatusCode());
+            }
         }
 
         return $this;