Skip to content

(WIP) feat(server-params): further define common server params #195

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
gsdevme wants to merge 1 commit into from
Closed

(WIP) feat(server-params): further define common server params #195

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion src/RequestHeaderParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,12 @@ private function parseRequest($data)
// previous properties and restoring original request-target
$serverParams = array(
'REQUEST_TIME' => time(),
'REQUEST_TIME_FLOAT' => microtime(true)
'REQUEST_TIME_FLOAT' => microtime(true),
'REQUEST_METHOD' => $request->getMethod(),
'CONTENT_LENGTH' => strlen($data),
'QUERY_STRING' => (string)parse_url($request->getUri(), PHP_URL_QUERY),
'SERVER_SOFTWARE' => 'reactphp/http',
'SERVER_PROTOCOL' => $request->getProtocolVersion(),
);

if ($this->remoteSocketUri !== null) {
Expand Down
68 changes: 67 additions & 1 deletion tests/RequestHeaderParserTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,20 +334,52 @@ public function testServerParamsWillBeSetOnHttpRequest()
$request = $parsedRequest;
});

$parser->feed("GET /foo HTTP/1.0\r\nHost: example.com\r\n\r\n");
$data = "GET /foo?s=hello&world=1 HTTP/1.0\r\nHost: example.com\r\n\r\n";

$parser->feed($data);
$serverParams = $request->getServerParams();

$this->assertArrayNotHasKey('HTTPS', $serverParams);
$this->assertNotEmpty($serverParams['REQUEST_TIME']);
$this->assertNotEmpty($serverParams['REQUEST_TIME_FLOAT']);

$this->assertEquals('GET', $serverParams['REQUEST_METHOD']);
$this->assertEquals(strlen($data), $serverParams['CONTENT_LENGTH']);
$this->assertEquals('reactphp/http', $serverParams['SERVER_SOFTWARE']);
$this->assertEquals('1.0', $serverParams['SERVER_PROTOCOL']);
$this->assertEquals('s=hello&world=1', $serverParams['QUERY_STRING']);
$this->assertEquals('127.1.1.1', $serverParams['SERVER_ADDR']);
$this->assertEquals('8000', $serverParams['SERVER_PORT']);

$this->assertEquals('192.168.1.1', $serverParams['REMOTE_ADDR']);
$this->assertEquals('8001', $serverParams['REMOTE_PORT']);
}

/**
* @dataProvider getServerParamsProvider
*/
public function testServerParams($data, array $params)
{
$request = null;
$parser = new RequestHeaderParser(
'http://127.1.1.1:8000'
);

$parser->on(
'headers',
function ($parsedRequest) use (&$request) {
$request = $parsedRequest;
}
);

$parser->feed($data);
$serverParams = $request->getServerParams();

foreach ($params as $name => $expectedValue) {
$this->assertEquals($expectedValue, $serverParams[$name]);
}
}

public function testServerParamsWontBeSetOnMissingUrls()
{
$request = null;
Expand Down Expand Up @@ -408,4 +440,38 @@ private function createAdvancedPostRequest()

return $data;
}

/**
* This is used to test different combinations of requests and ensure the
* server params are correct
*/
public function getServerParamsProvider()
{
return [
[
"GET /foo HTTP/1.0\r\nHost: example.com\r\n\r\n",
[
'QUERY_STRING' => '',
'REQUEST_METHOD' => 'GET',
'SERVER_PROTOCOL' => '1.0',
],
],
[
"POST /foo HTTP/1.0\r\nHost: example.com\r\n\r\n",
[
'QUERY_STRING' => '',
'REQUEST_METHOD' => 'POST',
'SERVER_PROTOCOL' => '1.0',
],
],
[
"GET /foo?year=2017 HTTP/1.1\r\nHost: example.com\r\n\r\n",
[
'QUERY_STRING' => 'year=2017',
'REQUEST_METHOD' => 'GET',
'SERVER_PROTOCOL' => '1.1',
],
],
];
}
}