From dd75dafe97e05bb11efacd53f4095e72208bbd71 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 14 Mar 2016 23:25:52 -0400 Subject: [PATCH 1/2] Fix passing closing code if valid, updated user agent --- src/Handshake/ClientNegotiator.php | 4 ++-- src/Messaging/MessageBuffer.php | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Handshake/ClientNegotiator.php b/src/Handshake/ClientNegotiator.php index 8726c8f..70856df 100644 --- a/src/Handshake/ClientNegotiator.php +++ b/src/Handshake/ClientNegotiator.php @@ -23,7 +23,7 @@ class ClientNegotiator { 'Connection' => 'Upgrade' , 'Upgrade' => 'websocket' , 'Sec-WebSocket-Version' => $this->getVersion() - , 'User-Agent' => "RatchetRFC/0.0.0" + , 'User-Agent' => "Ratchet" ]); } @@ -50,4 +50,4 @@ class ClientNegotiator { public function getVersion() { return 13; } -} \ No newline at end of file +} diff --git a/src/Messaging/MessageBuffer.php b/src/Messaging/MessageBuffer.php index fc304b1..af27850 100644 --- a/src/Messaging/MessageBuffer.php +++ b/src/Messaging/MessageBuffer.php @@ -157,7 +157,7 @@ class MessageBuffer { return $this->newCloseFrame(Frame::CLOSE_BAD_PAYLOAD); } - return $this->newCloseFrame(Frame::CLOSE_NORMAL); + return $this->newCloseFrame($closeCode); break; case Frame::OP_PING: case Frame::OP_PONG: From ccef4dc3848b77a19b90b207b2599c78d7f2f282 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Tue, 15 Mar 2016 11:55:15 -0400 Subject: [PATCH 2/2] Echo valid clode code back to peer handler --- src/Messaging/MessageBuffer.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Messaging/MessageBuffer.php b/src/Messaging/MessageBuffer.php index af27850..d0464e1 100644 --- a/src/Messaging/MessageBuffer.php +++ b/src/Messaging/MessageBuffer.php @@ -157,7 +157,7 @@ class MessageBuffer { return $this->newCloseFrame(Frame::CLOSE_BAD_PAYLOAD); } - return $this->newCloseFrame($closeCode); + return $frame; break; case Frame::OP_PING: case Frame::OP_PONG: