mirror_php/guzzle
1
0
Fork 0
mirror of https://github.com/guzzle/guzzle.git synced 2025-02-13 03:45:22 +01:00
Code Issues Releases Wiki Activity

[Http] Cleaning up message parsing

Browse Source
This commit is contained in:
Michael Dowling 2011-03-29 13:04:34 -05:00
parent 6e02eee711
commit 7c5d5a9867
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
library/Guzzle/Http/Message/RequestFactory.php
View File

@ -76,14 +76,17 @@ class RequestFactory
$message = preg_replace("/([^\r])(\n)\b/", "$1\r\n", $message);
$parts = explode("\r\n\r\n", $message, 2);
$headers = array();
$scheme = $host = $method = $user = $pass = $query = $port = '';
$scheme = $host = $method = $user = $pass = $query = $port = $version = $protocol = '';
$path = '/';
// Parse each line in the message
foreach (explode("\r\n", $parts[0]) as $line) {
if (preg_match('/^(GET|POST|PUT|HEAD|DELETE|TRACE|OPTIONS)\s+\/*.+\s+[A-Za-z]+\/[0-9]\.[0-9]\s*$/i', $line)) {
list($method, $path, $protocol) = array_map('trim', explode(' ', $line, 3));
list($protocol, $version) = explode('/', $protocol);
$matches = array();
if (preg_match('#^(?<method>GET|POST|PUT|HEAD|DELETE|TRACE|OPTIONS)\s+(?<path>/.*)\s+(?<protocol>\w+)/(?<version>\d\.\d)\s*$#i', $line, $matches)) {
$method = strtoupper($matches['method']);
$protocol = strtoupper($matches['protocol']);
$path = $matches['path'];
$version = $matches['version'];
$scheme = 'http';
} else if (strpos($line, ':')) {
list($key, $value) = explode(':', $line, 2);
@ -130,8 +133,8 @@ class RequestFactory
}
return array(
'method' => strtoupper($method),
'protocol' => strtoupper($protocol),
'method' => $method,
'protocol' => $protocol,
'protocol_version' => $version,
'parts' => array(
'scheme' => $scheme,