Merge pull request #2171 from MGatner/setheader-dupes

Setheader dupes

Author: lonnieezell

system/HTTP/Message.php

@@ -266,23 +266,16 @@ public function getHeaderLine(string $name): string
 	 */
 	public function setHeader(string $name, $value)
 	{
-		if (! isset($this->headers[$name]))
+		$origName = $this->getHeaderName($name);
+		
+		if (isset($this->headers[$origName]) && is_array($this->headers[$origName]))
 		{
-			$this->headers[$name] = new Header($name, $value);
-
-			$this->headerMap[strtolower($name)] = $name;
-
-			return $this;
-		}
-
-		if (! is_array($this->headers[$name]))
-		{
-			$this->headers[$name] = [$this->headers[$name]];
+			$this->appendHeader($origName, $value);
 		}
-
-		if (isset($this->headers[$name]))
+		else
 		{
-			$this->headers[$name] = new Header($name, $value);
+			$this->headers[$origName] = new Header($origName, $value);
+			$this->headerMap[strtolower($origName)] = $origName;
 		}
 
 		return $this;

tests/system/HTTP/MessageTest.php

@@ -181,17 +181,25 @@ public function testAppendBody()
 
 	public function testSetHeaderReplacingHeader()
 	{
-			$this->message->setHeader('Accept', 'json');
+		$this->message->setHeader('Accept', 'json');
 
-				$this->assertEquals('json', $this->message->getHeaderLine('Accept'));
+		$this->assertEquals('json', $this->message->getHeaderLine('Accept'));
 	}
 
 	public function testSetHeaderDuplicateSettings()
 	{
 		$this->message->setHeader('Accept', 'json');
 		$this->message->setHeader('Accept', 'xml');
 
-			$this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
+		$this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
+	}
+
+	public function testSetHeaderDuplicateSettingsInsensitive()
+	{
+		$this->message->setHeader('Accept', 'json');
+		$this->message->setHeader('accept', 'xml');
+
+		$this->assertEquals('xml', $this->message->getHeaderLine('Accept'));
 	}
 
 	public function testSetHeaderArrayValues()