From f9ce641f04023590ecf8091a029adb99aed7eca9 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Tue, 12 Jun 2012 20:49:05 -0400 Subject: [PATCH] CS --- src/Ratchet/WebSocket/HandshakeNegotiator.php | 7 +------ src/Ratchet/WebSocket/Version/RFC6455.php | 2 +- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/src/Ratchet/WebSocket/HandshakeNegotiator.php b/src/Ratchet/WebSocket/HandshakeNegotiator.php index 1b80b13..07eac1e 100644 --- a/src/Ratchet/WebSocket/HandshakeNegotiator.php +++ b/src/Ratchet/WebSocket/HandshakeNegotiator.php @@ -115,12 +115,7 @@ class HandshakeNegotiator implements MessageInterface { public function disableVersion($versionId) { unset($this->versions[$versionId]); - $this->versionString = ''; - - foreach ($this->versions as $id => $object) { - $this->versionString .= "{$id}, "; - } - $this->versionString = substr($this->versionString, 0, -2); + $this->versionString = implode(',', array_keys($this->versions)); return $this; } diff --git a/src/Ratchet/WebSocket/Version/RFC6455.php b/src/Ratchet/WebSocket/Version/RFC6455.php index 2f06de8..f734042 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455.php +++ b/src/Ratchet/WebSocket/Version/RFC6455.php @@ -172,6 +172,6 @@ class RFC6455 implements VersionInterface { * @internal */ public function sign($key) { - return base64_encode(sha1($key . static::GUID, 1)); + return base64_encode(sha1($key . static::GUID, true)); } } \ No newline at end of file