From ef5ece0739ea62cedbd9f865e122b5f41975fcfe Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Mon, 14 Oct 2013 10:25:51 -0400 Subject: [PATCH] [ws] Updated onError handle to make sure to close if conditions aren't met --- src/Ratchet/WebSocket/WsServer.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/Ratchet/WebSocket/WsServer.php b/src/Ratchet/WebSocket/WsServer.php index 1b7c199..c76fd3f 100644 --- a/src/Ratchet/WebSocket/WsServer.php +++ b/src/Ratchet/WebSocket/WsServer.php @@ -149,10 +149,8 @@ class WsServer implements HttpServerInterface { * {@inheritdoc} */ public function onError(ConnectionInterface $conn, \Exception $e) { - if ($conn->WebSocket->established) { - if ($this->connections->contains($conn)) { - $this->component->onError($this->connections[$conn], $e); - } + if ($conn->WebSocket->established && $this->connections->contains($conn)) { + $this->component->onError($this->connections[$conn], $e); } else { $conn->close(); }