faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Guzzle update

Browse Source 
Updated Guzzle to 2.4.1
Fixed code to pass unit tests from update
This commit is contained in:
Chris Boden 2012-05-04 18:17:23 -04:00
parent 7f27629df6
commit 8ab79d217f
4 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -21,7 +21,7 @@
} }
, "require": { , "require": {
"php": ">=5.3.2" "php": ">=5.3.2"
, "guzzle/guzzle": "v2.0.2" , "guzzle/guzzle": "2.4.*"
, "symfony/http-foundation": "2.1.*" , "symfony/http-foundation": "2.1.*"
} }
} }

16
composer.lock generated
View File

@ -1,14 +1,24 @@
{ {
"hash": "c4bc28d46c32e18713efab25a77428e6", "hash": "8cea9930a3f96f47c598f35e2ea96a85",
"packages": [ "packages": [
{ {
"package": "doctrine/common", "package": "doctrine/common",
"version": "2.2.x-dev", "version": "2.2.x-dev",
"source-reference": "1e0aa60d109c630d19543d999f12e2852ef8f932" "source-reference": "1e0aa60d109c630d19543d999f12e2852ef8f932"
}, },
{
"package": "evenement/evenement",
"version": "dev-master",
"source-reference": "808e3aaea8d4f908e455b0e047cc1acc46b38d44"
},
{ {
"package": "guzzle/guzzle", "package": "guzzle/guzzle",
"version": "v2.0.2" "version": "v2.4.1"
},
{
"package": "igorw/socket-server",
"version": "dev-master",
"source-reference": "e813968da434ed45219718bc2db29a01174045b6"
}, },
{ {
"package": "symfony/event-dispatcher", "package": "symfony/event-dispatcher",
@ -24,7 +34,7 @@
{ {
"package": "symfony/validator", "package": "symfony/validator",
"version": "dev-master", "version": "dev-master",
"source-reference": "704f655d060b14475d7bd2a0b6d653c70f88218a" "source-reference": "dac248b43b62d30023dd9b73ad7e5b7bc1128e5e"
} }
], ],
"packages-dev": null, "packages-dev": null,

10
src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
View File

@ -14,17 +14,15 @@ class HandshakeVerifier {
* @return bool TRUE if all headers are valid, FALSE if 1 or more were invalid * @return bool TRUE if all headers are valid, FALSE if 1 or more were invalid
*/ */
public function verifyAll(RequestInterface $request) { public function verifyAll(RequestInterface $request) {
$headers = $request->getHeaders();
$passes = 0; $passes = 0;
$passes += (int)$this->verifyMethod($request->getMethod()); $passes += (int)$this->verifyMethod($request->getMethod());
$passes += (int)$this->verifyHTTPVersion($request->getProtocolVersion()); $passes += (int)$this->verifyHTTPVersion($request->getProtocolVersion());
$passes += (int)$this->verifyRequestURI($request->getPath()); $passes += (int)$this->verifyRequestURI($request->getPath());
$passes += (int)$this->verifyHost($headers['Host']); $passes += (int)$this->verifyHost($request->getHeader('Host', true));
$passes += (int)$this->verifyUpgradeRequest($headers['Upgrade']); $passes += (int)$this->verifyUpgradeRequest($request->getHeader('Upgrade', true));
$passes += (int)$this->verifyConnection($headers['Connection']); $passes += (int)$this->verifyConnection($request->getHeader('Connection', true));
$passes += (int)$this->verifyKey($headers['Sec-WebSocket-Key']); $passes += (int)$this->verifyKey($request->getHeader('Sec-WebSocket-Key', true));
//$passes += (int)$this->verifyVersion($headers['Sec-WebSocket-Version']); // Temporarily breaking functionality //$passes += (int)$this->verifyVersion($headers['Sec-WebSocket-Version']); // Temporarily breaking functionality
return (7 === $passes); return (7 === $passes);

2
tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
View File

@ -116,7 +116,7 @@ class RFC6455Test extends \PHPUnit_Framework_TestCase {
* @dataProvider headerHandshakeProvider * @dataProvider headerHandshakeProvider
*/ */
public function testVariousHeadersToCheckHandshakeTolerance($pass, $header) { public function testVariousHeadersToCheckHandshakeTolerance($pass, $header) {
$request = RequestFactory::fromMessage($header); $request = RequestFactory::getInstance()->fromMessage($header);
if ($pass) { if ($pass) {
$this->assertInstanceOf('\\Guzzle\\Http\\Message\\Response', $this->_version->handshake($request)); $this->assertInstanceOf('\\Guzzle\\Http\\Message\\Response', $this->_version->handshake($request));