Skip to content

Commit ed640a4

Browse files
committed
[HttpFoundation] Basic auth in url is broken when using PHP CGI/FPM
Request#getUser() and Request#getPassword() introduced in aecfd0a8917370edd237120352749141ffa85362 do not handle the lack of PHP_AUTH_USER and PHP_AUTH_PW in $this->server when using PHP-FPM. Use $this->headers instead. Furthermore, the test of empty password now expects an empty string instead of NULL according to a450d002f253e32e77d5c2bd3e490435c68a8c09.
1 parent 7b23253 commit ed640a4

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

Request.php

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -949,7 +949,7 @@ public function getPort()
949949
*/
950950
public function getUser()
951951
{
952-
return $this->server->get('PHP_AUTH_USER');
952+
return $this->headers->get('PHP_AUTH_USER');
953953
}
954954

955955
/**
@@ -959,7 +959,7 @@ public function getUser()
959959
*/
960960
public function getPassword()
961961
{
962-
return $this->server->get('PHP_AUTH_PW');
962+
return $this->headers->get('PHP_AUTH_PW');
963963
}
964964

965965
/**

Tests/RequestTest.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -209,7 +209,7 @@ public function testCreate()
209209
$this->assertEquals(80, $request->getPort());
210210
$this->assertEquals('test.com', $request->getHttpHost());
211211
$this->assertEquals('testnopass', $request->getUser());
212-
$this->assertNull($request->getPassword());
212+
$this->assertSame('',$request->getPassword());
213213
$this->assertFalse($request->isSecure());
214214

215215
$request = Request::create('http://test.com/?foo');

0 commit comments

Comments
 (0)