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

[REFACTOR] Fixing some code based on unit tests

Browse Source 
Change the response to send the proper header and fix the generate key method to fail properly when no spaces are present
This commit is contained in:
Mike Almond 2012-02-01 13:16:59 -05:00
parent a18af41a74
commit 2996c08728
1 changed files with 6 additions and 5 deletions

11
lib/Ratchet/Application/WebSocket/Version/Hixie76.php
View File

@ -38,10 +38,8 @@ class Hixie76 implements VersionInterface {
$headers['Sec-WebSocket-Protocol'] = $request->getHeader('Sec-WebSocket-Protocol');
}
$response = new \Guzzle\Http\Message\Response(101, $headers, $body);
$response = new \Guzzle\Http\Message\Response('HTTP/1.1 101 WebSocket Protocol Handshake', $headers, $body);
return $response;
}
public function newMessage() {
@ -56,10 +54,13 @@ class Hixie76 implements VersionInterface {
return chr(0) . $message . chr(255);
}
protected function generateKeyNumber($key) {
public function generateKeyNumber($key) {
if (substr_count($key, ' ') == 0) {
return '';
}
$int = preg_replace('[\D]', '', $key) / substr_count($key, ' ');
return (is_int($int) && substr_count($key, ' ') > 0) ? $int : '';
return (is_int($int)) ? $int : '';
}