From 8ab79d217faaeb10ea6199d467e2adaf81eca1a4 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Fri, 4 May 2012 18:17:23 -0400
Subject: [PATCH] Guzzle update

Updated Guzzle to 2.4.1
Fixed code to pass unit tests from update
---
 composer.json                                    |  2 +-
 composer.lock                                    | 16 +++++++++++++---
 .../Version/RFC6455/HandshakeVerifier.php        | 10 ++++------
 .../Component/WebSocket/Version/RFC6455Test.php  |  2 +-
 4 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/composer.json b/composer.json
index 40a7dba..3273137 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
     }
   , "require": {
         "php": ">=5.3.2"
-      , "guzzle/guzzle": "v2.0.2"
+      , "guzzle/guzzle": "2.4.*"
       , "symfony/http-foundation": "2.1.*"
     }
 }
\ No newline at end of file
diff --git a/composer.lock b/composer.lock
index 496e1fb..8acd009 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1,14 +1,24 @@
 {
-    "hash": "c4bc28d46c32e18713efab25a77428e6",
+    "hash": "8cea9930a3f96f47c598f35e2ea96a85",
     "packages": [
         {
             "package": "doctrine/common",
             "version": "2.2.x-dev",
             "source-reference": "1e0aa60d109c630d19543d999f12e2852ef8f932"
         },
+        {
+            "package": "evenement/evenement",
+            "version": "dev-master",
+            "source-reference": "808e3aaea8d4f908e455b0e047cc1acc46b38d44"
+        },
         {
             "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",
@@ -24,7 +34,7 @@
         {
             "package": "symfony/validator",
             "version": "dev-master",
-            "source-reference": "704f655d060b14475d7bd2a0b6d653c70f88218a"
+            "source-reference": "dac248b43b62d30023dd9b73ad7e5b7bc1128e5e"
         }
     ],
     "packages-dev": null,
diff --git a/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php b/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
index fd342a3..3c634e6 100644
--- a/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
+++ b/src/Ratchet/Component/WebSocket/Version/RFC6455/HandshakeVerifier.php
@@ -14,17 +14,15 @@ class HandshakeVerifier {
      * @return bool TRUE if all headers are valid, FALSE if 1 or more were invalid
      */
     public function verifyAll(RequestInterface $request) {
-        $headers = $request->getHeaders();
-
         $passes = 0;
 
         $passes += (int)$this->verifyMethod($request->getMethod());
         $passes += (int)$this->verifyHTTPVersion($request->getProtocolVersion());
         $passes += (int)$this->verifyRequestURI($request->getPath());
-        $passes += (int)$this->verifyHost($headers['Host']);
-        $passes += (int)$this->verifyUpgradeRequest($headers['Upgrade']);
-        $passes += (int)$this->verifyConnection($headers['Connection']);
-        $passes += (int)$this->verifyKey($headers['Sec-WebSocket-Key']);
+        $passes += (int)$this->verifyHost($request->getHeader('Host', true));
+        $passes += (int)$this->verifyUpgradeRequest($request->getHeader('Upgrade', true));
+        $passes += (int)$this->verifyConnection($request->getHeader('Connection', true));
+        $passes += (int)$this->verifyKey($request->getHeader('Sec-WebSocket-Key', true));
         //$passes += (int)$this->verifyVersion($headers['Sec-WebSocket-Version']); // Temporarily breaking functionality
 
         return (7 === $passes);
diff --git a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php b/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
index 68d468b..3b22481 100644
--- a/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
+++ b/tests/Ratchet/Tests/Component/WebSocket/Version/RFC6455Test.php
@@ -116,7 +116,7 @@ class RFC6455Test extends \PHPUnit_Framework_TestCase {
      * @dataProvider headerHandshakeProvider
      */
     public function testVariousHeadersToCheckHandshakeTolerance($pass, $header) {
-        $request = RequestFactory::fromMessage($header);
+        $request = RequestFactory::getInstance()->fromMessage($header);
 
         if ($pass) {
             $this->assertInstanceOf('\\Guzzle\\Http\\Message\\Response', $this->_version->handshake($request));