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

Fixing request parser so that lines are normalized.

Browse Source
This commit is contained in:
Michael Dowling 2012-04-23 19:07:49 -07:00
parent f5ee3fb453
commit b1570da70c
2 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Guzzle/Http/Message/RequestFactory.php
View File

@ -67,15 +67,23 @@ class RequestFactory implements RequestFactoryInterface
return false; return false;
} }
// Normalize new lines in the message
$message = preg_replace("/([^\r])(\n)\b/", "$1\r\n", $message);
$parts = explode("\r\n\r\n", $message, 2);
$headers = new Collection(); $headers = new Collection();
$scheme = $host = $method = $user = $pass = $query = $port = $version = $protocol = ''; $scheme = $host = $body = $method = $user = $pass = $query = $port = $version = $protocol = '';
$path = '/'; $path = '/';
// Parse each line in the message // Inspired by https://github.com/kriswallsmith/Buzz/blob/message-interfaces/lib/Buzz/Message/Parser/Parser.php#L16
foreach (explode("\r\n", $parts[0]) as $line) { $lines = preg_split('/(\\r?\\n)/', $message, -1, PREG_SPLIT_DELIM_CAPTURE);
for ($i = 0, $c = count($lines); $i < $c; $i += 2) {
$line = $lines[$i];
// If two line breaks were encountered, then this is the body
if (empty($line)) {
$body = implode('', array_slice($lines, $i + 2));
break;
}
// Parse message headers
$matches = array(); $matches = array();
if (!$method && preg_match('#^(?P<method>[A-Za-z]+)\s+(?P<path>/.*)\s+(?P<protocol>\w+)/(?P<version>\d\.\d)\s*$#i', $line, $matches)) { if (!$method && preg_match('#^(?P<method>[A-Za-z]+)\s+(?P<path>/.*)\s+(?P<protocol>\w+)/(?P<version>\d\.\d)\s*$#i', $line, $matches)) {
$method = strtoupper($matches['method']); $method = strtoupper($matches['method']);
@ -95,9 +103,6 @@ class RequestFactory implements RequestFactoryInterface
} }
} }
// Check if a body is present in the message
$body = isset($parts[1]) ? $parts[1] : null;
// Check for the Host header // Check for the Host header
if (isset($headers['Host'])) { if (isset($headers['Host'])) {
$host = $headers['Host']; $host = $headers['Host'];

11
tests/Guzzle/Tests/Http/Message/RequestFactoryTest.php
View File

@ -329,7 +329,7 @@ class HttpRequestFactoryTest extends \Guzzle\Tests\GuzzleTestCase
* @covers Guzzle\Http\Message\RequestFactory::parseMessage * @covers Guzzle\Http\Message\RequestFactory::parseMessage
* @covers Guzzle\Http\Message\RequestFactory::create * @covers Guzzle\Http\Message\RequestFactory::create
*/ */
public function testCreatesHttpMessagesWithBodies() public function testCreatesHttpMessagesWithBodiesAndNormalizesLineEndings()
{ {
$message = "POST / http/1.1\r\n" $message = "POST / http/1.1\r\n"
. "Content-Type:application/x-www-form-urlencoded; charset=utf8\r\n" . "Content-Type:application/x-www-form-urlencoded; charset=utf8\r\n"
@ -339,6 +339,15 @@ class HttpRequestFactoryTest extends \Guzzle\Tests\GuzzleTestCase
$request = RequestFactory::getInstance()->fromMessage($message); $request = RequestFactory::getInstance()->fromMessage($message);
$this->assertEquals('application/x-www-form-urlencoded; charset=utf8', (string) $request->getHeader('Content-Type')); $this->assertEquals('application/x-www-form-urlencoded; charset=utf8', (string) $request->getHeader('Content-Type'));
$this->assertEquals('foo=bar', (string) $request->getBody());
$message = "POST / http/1.1\n"
. "Content-Type:application/x-www-form-urlencoded; charset=utf8\n"
. "Date:Mon, 09 Sep 2011 23:36:00 GMT\n"
. "Host:host.foo.com\n\n"
. "foo=bar";
$request = RequestFactory::getInstance()->fromMessage($message);
$this->assertEquals('foo=bar', (string) $request->getBody());
$message = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n"; $message = "HTTP/1.1 404 Not Found\r\nContent-Length: 0\r\n\r\n";
$request = RequestFactory::getInstance()->fromMessage($message); $request = RequestFactory::getInstance()->fromMessage($message);