Skip to content
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

Jump to bottom

Use new Guzzle PSR7 parser #29

Merged
merged 1 commit into from
May 21, 2015
Merged

Use new Guzzle PSR7 parser #29

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
8 changes: 4 additions & 4 deletions composer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
"license": "MIT",
"require": {
"php": ">=5.4.0",
"guzzle/parser": "~3.0",
"react/socket": "0.4.*",
"react/stream": "0.4.*",
"evenement/evenement": "~2.0"
"guzzlehttp/psr7": "^1.0",
"react/socket": "^0.4",
"react/stream": "^0.4",
"evenement/evenement": "^2.0"
},
"autoload": {
"psr-4": {
Expand Down
27 changes: 17 additions & 10 deletions src/RequestHeaderParser.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
namespace React\Http;

use Evenement\EventEmitter;
use Guzzle\Parser\Message\MessageParser;
use GuzzleHttp\Psr7 as g7;

/**
* @event headers
Expand Down Expand Up @@ -36,20 +36,27 @@ public function parseRequest($data)
{
list($headers, $bodyBuffer) = explode("\r\n\r\n", $data, 2);

$parser = new MessageParser();
$parsed = $parser->parseRequest($headers."\r\n\r\n");
$psrRequest = g7\parse_request($headers);

$parsedQuery = array();
if ($parsed['request_url']['query']) {
parse_str($parsed['request_url']['query'], $parsedQuery);
$parsedQuery = [];
$queryString = $psrRequest->getUri()->getQuery();
if ($queryString) {
parse_str($queryString, $parsedQuery);
}

$headers = $psrRequest->getHeaders();
array_walk($headers, function(&$val) {
if (1 === count($val)) {
$val = $val[0];
}
});

$request = new Request(
$parsed['method'],
$parsed['request_url']['path'],
$psrRequest->getMethod(),
$psrRequest ->getUri()->getPath(),
$parsedQuery,
$parsed['version'],
$parsed['headers']
$psrRequest->getProtocolVersion(),
$headers
);

return array($request, $bodyBuffer);
Expand Down