From 6cc97ab44539a805e1bca561e389d8b1e6f7af95 Mon Sep 17 00:00:00 2001
From: Chris Boden <cboden@gmail.com>
Date: Wed, 15 Jul 2015 11:29:06 -0400
Subject: [PATCH] Attempt handshake after adding to buffer
---
src/Ratchet/WebSocket/WsServer.php | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Ratchet/WebSocket/WsServer.php b/src/Ratchet/WebSocket/WsServer.php
index b4be1f0..5783789 100644
--- a/src/Ratchet/WebSocket/WsServer.php
+++ b/src/Ratchet/WebSocket/WsServer.php
@@ -102,14 +102,14 @@ class WsServer implements HttpServerInterface {
protected function attemptUpgrade(ConnectionInterface $conn, $data = '') {
if ('' !== $data) {
$conn->WebSocket->request->getBody()->write($data);
- } else {
- if (!$this->versioner->isVersionEnabled($conn->WebSocket->request)) {
- return $this->close($conn);
- }
-
- $conn->WebSocket->version = $this->versioner->getVersion($conn->WebSocket->request);
}
+ if (!$this->versioner->isVersionEnabled($conn->WebSocket->request)) {
+ return $this->close($conn);
+ }
+
+ $conn->WebSocket->version = $this->versioner->getVersion($conn->WebSocket->request);
+
try {
$response = $conn->WebSocket->version->handshake($conn->WebSocket->request);
} catch (\UnderflowException $e) {