From 3030c81f03fbff77698df4e378f76cb549dc995e Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sun, 31 Mar 2013 14:02:10 -0400 Subject: [PATCH] [WebSocket] Fixed Hixie handshake bug (for real this time) refs #80 --- src/Ratchet/WebSocket/Version/Hixie76.php | 8 +------- tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php | 4 ---- 2 files changed, 1 insertion(+), 11 deletions(-) diff --git a/src/Ratchet/WebSocket/Version/Hixie76.php b/src/Ratchet/WebSocket/Version/Hixie76.php index ab34925..536977b 100644 --- a/src/Ratchet/WebSocket/Version/Hixie76.php +++ b/src/Ratchet/WebSocket/Version/Hixie76.php @@ -103,13 +103,7 @@ class Hixie76 implements VersionInterface { } public function generateKeyNumber($key) { - if (0 === substr_count($key, ' ')) { - return ''; - } - - $int = (int)preg_replace('[\D]', '', $key) / substr_count($key, ' '); - - return (is_int($int)) ? $int : ''; + return preg_replace('[\D]', '', $key) / substr_count($key, ' '); } protected function sign($key1, $key2, $code) { diff --git a/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php index 7107a1b..fecca81 100644 --- a/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php +++ b/tests/Ratchet/Tests/WebSocket/Version/Hixie76Test.php @@ -31,11 +31,7 @@ class Hixie76Test extends \PHPUnit_Framework_TestCase { public static function keyProvider() { return array( array(179922739, '17 9 G`ZD9 2 2b 7X 3 /r90') - , array('', '17 9 G`ZD9 2 2b 7X 3 /r91') , array(906585445, '3e6b263 4 17 80') - , array('', '3e6b263 4 17 80') - , array('', '3e6b63 4 17 80') - , array('', '3e6b6341780') ); }