adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2024-11-15 03:18:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #9255 from cakephp/issue-9229-restore

Browse source 
Restore header() behavior inadvertantely removed.
This commit is contained in:
José Lorenzo Rodríguez 2016-08-15 09:51:10 +02:00 committed by GitHub
commit 3937a4f02e
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/Cake/Network/CakeRequest.php
View file

@ -748,13 +748,12 @@ class CakeRequest implements ArrayAccess {
* @return mixed Either false on no header being set or the value of the header.
*/
public static function header($name) {
$name = strtoupper(str_replace('-', '_', $name));
$httpName = 'HTTP_' . $name;
$httpName = 'HTTP_' . strtoupper(str_replace('-', '_', $name)); ;
if (isset($_SERVER[$httpName])) {
return $_SERVER[$httpName];
}
// Work around Apache issues where 'Authorization' is not
// passed to PHP.
// Use the provided value, in some configurations apache will
// pass Authorization with no prefix and in Titlecase.
if (isset($_SERVER[$name])) {
return $_SERVER[$name];
}

5
lib/Cake/Test/Case/Network/CakeRequestTest.php
View file

@ -1147,13 +1147,14 @@ class CakeRequestTest extends CakeTestCase {
$_SERVER['HTTP_X_THING'] = '';
$_SERVER['HTTP_HOST'] = 'localhost';
$_SERVER['HTTP_USER_AGENT'] = 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_6_4; en-ca) AppleWebKit/534.8+ (KHTML, like Gecko) Version/5.0 Safari/533.16';
$_SERVER['AUTHORIZATION'] = 'foobar';
$_SERVER['Authorization'] = 'foobar';
$request = new CakeRequest('/', false);
$this->assertEquals($_SERVER['HTTP_HOST'], $request->header('host'));
$this->assertEquals($_SERVER['HTTP_USER_AGENT'], $request->header('User-Agent'));
$this->assertSame('', $request->header('X-thing'));
$this->assertEquals($_SERVER['AUTHORIZATION'], $request->header('Authorization'));
$this->assertEquals($_SERVER['Authorization'], $request->header('Authorization'));
$this->assertFalse($request->header('authorization'));
}
/**