From eb77cf139ef54729b7e8dd97664fe48850bd9b20 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 20 Jul 2013 22:03:46 -0400 Subject: [PATCH] Updated example, slight Origin order change in app --- README.md | 20 ++++++++++++++------ src/Ratchet/App.php | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index a9cefad..1ea2fca 100644 --- a/README.md +++ b/README.md @@ -30,20 +30,21 @@ Need help? Have a question? Want to provide feedback? Write a message on the --- -###A quick server example +###A quick example ```php route('/chat', new Chat); - $app->route('/echo', new Ratchet\Server\EchoServer); + $app = new Ratchet\App('localhost', 8080); + $app->route('/chat', new MyChat); + $app->route('/echo', new Ratchet\Server\EchoServer, array(*)); $app->run(); ``` - $ php chat.php \ No newline at end of file + $ php chat.php + +```javascript + // Then some JavaScript in the browser: + var conn = new WebSocket('ws://localhost/echo'); + conn.onmessage = function(e) { console.log(e.data); }; + conn.send('Hello Me!'); +``` \ No newline at end of file diff --git a/src/Ratchet/App.php b/src/Ratchet/App.php index 5a00fdd..3d8dec0 100644 --- a/src/Ratchet/App.php +++ b/src/Ratchet/App.php @@ -97,10 +97,10 @@ class App { $httpHost = $httpHost ?: $this->httpHost; + $allowedOrigins = array_values($allowedOrigins); if (0 === count($allowedOrigins)) { $allowedOrigins[] = $httpHost; } - $allowedOrigins = array_values($allowedOrigins); if ('*' !== $allowedOrigins[0]) { $decorated = new OriginCheck($decorated, $allowedOrigins); }