Merge branch 'refs/heads/wamp-errors'

This commit is contained in:
Chris Boden 2014-06-07 11:35:24 -04:00
commit f8098db6cc
2 changed files with 3 additions and 3 deletions

View File

@ -90,7 +90,7 @@ class ServerProtocol implements MessageComponentInterface, WsServerInterface {
}
if (!is_array($json) || $json !== array_values($json)) {
throw new \UnexpectedValueException("Invalid WAMP message format");
throw new Exception("Invalid WAMP message format");
}
switch ($json[0]) {
@ -134,7 +134,7 @@ class ServerProtocol implements MessageComponentInterface, WsServerInterface {
break;
default:
throw new Exception('Invalid message type');
throw new Exception('Invalid WAMP message type');
}
}

View File

@ -39,7 +39,7 @@ class WampServer implements MessageComponentInterface, WsServerInterface {
public function onMessage(ConnectionInterface $conn, $msg) {
try {
$this->wampProtocol->onMessage($conn, $msg);
} catch (JsonException $je) {
} catch (Exception $je) {
$conn->close(1007);
} catch (\UnexpectedValueException $uve) {
$conn->close(1007);