Merge pull request #3109 from michalsn/clear_accept_encoding

Remove Accept-Encoding header after using populateHeaders() method
codeigniter4 · Jun 18, 2020 · 2f59f71 · 2f59f71
2 parents 1eac4e9 + 0719cbc
commit 2f59f71
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/system/HTTP/CURLRequest.php b/system/HTTP/CURLRequest.php
@@ -493,6 +493,7 @@ protected function applyRequestHeaders(array $curl_options = []): array
 			$this->populateHeaders();
 			// Otherwise, it will corrupt the request
 			$this->removeHeader('Host');
+			$this->removeHeader('Accept-Encoding');
 		}
 
 		$headers = $this->getHeaders();

diff --git a/tests/system/HTTP/CURLRequestTest.php b/tests/system/HTTP/CURLRequestTest.php
@@ -176,6 +176,7 @@ public function testOptionHeadersUsingPopulate()
 	{
 		$_SERVER['HTTP_HOST']            = 'site1.com';
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
+		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
 
 		$options = [
 			'base_uri' => 'http://www.foo.com/api/v1/',
@@ -187,6 +188,8 @@ public function testOptionHeadersUsingPopulate()
 		$this->assertEquals('en-US', $request->getHeader('Accept-Language')->getValue());
 		// but we skip Host header - since it would corrupt the request
 		$this->assertNull($request->getHeader('Host'));
+		// and Accept-Encoding
+		$this->assertNull($request->getHeader('Accept-Encoding'));
 	}
 
 	/**
@@ -196,16 +199,21 @@ public function testOptionHeadersNotUsingPopulate()
 	{
 		$_SERVER['HTTP_HOST']            = 'site1.com';
 		$_SERVER['HTTP_ACCEPT_LANGUAGE'] = 'en-US';
+		$_SERVER['HTTP_ACCEPT_ENCODING'] = 'gzip, deflate, br';
 
 		$options = [
 			'base_uri' => 'http://www.foo.com/api/v1/',
-			'headers'  => ['Host' => 'www.foo.com'],
+			'headers'  => [
+				'Host'            => 'www.foo.com',
+				'Accept-Encoding' => '',
+			],
 		];
 		$request = $this->getRequest($options);
 		$request->get('example');
 		// if headers for the request are defined we use them
 		$this->assertNull($request->getHeader('Accept-Language'));
 		$this->assertEquals('www.foo.com', $request->getHeader('Host')->getValue());
+		$this->assertEquals('', $request->getHeader('Accept-Encoding')->getValue());
 	}
 
 	//--------------------------------------------------------------------