diff --git a/CHANGELOG.md b/CHANGELOG.md index 6b55312..2c16bde 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,7 +14,6 @@ CHANGELOG * BC: Require hostname to do HTTP Host header match and do Origin HTTP header check, verify same name by default, helping prevent CSRF attacks * Added Symfony/2.2 based HTTP Router component to allowing for a single Ratchet server to handle multiple apps -> Ratchet\Http\Router * BC: Decoupled HTTP from WebSocket component -> Ratchet\Http\HttpServer - * Updated dependency to React/0.3 * BF: Single sub-protocol selection to conform with RFC6455 * BF: Sanity checks on WAMP protocol to prevent errors @@ -95,9 +94,4 @@ CHANGELOG * 0.1 (2012-05-11) * First release with components: IoServer, WsServer, SessionProvider, WampServer, FlashPolicy, IpBlackList -<<<<<<< HEAD - * I/O now handled by React, making Ratchet fully asynchronous - -======= - * I/O now handled by React, making Ratchet fully asynchronous ->>>>>>> refs/heads/master + * I/O now handled by React, making Ratchet fully asynchronous \ No newline at end of file diff --git a/Makefile b/Makefile index aa143cc..0595b04 100644 --- a/Makefile +++ b/Makefile @@ -30,5 +30,5 @@ apidocs: -s vendor/react \ -s vendor/guzzle \ -s vendor/symfony/http-foundation/Symfony/Component/HttpFoundation/Session \ - -s vendor/symfony/http-foundation/Symfony/Component/Routing \ + -s vendor/symfony/routing/Symfony/Component/Routing \ -s vendor/evenement/evenement/src/Evenement diff --git a/README.md b/README.md index 5ac53b6..fa127b6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Build up your application through simple interfaces and re-use your application ##WebSocket Compliance * Supports the RFC6455, HyBi-10+, and Hixie76 protocol versions (at the same time) -* Tested on Chrome 13 - 28, Firefox 6 - 22, Safari 5.0.1 - 6, iOS 4.2 - 7 +* Tested on Chrome 13 - 30, Firefox 6 - 24, Safari 5.0.1 - 6, iOS 4.2 - 7 * Ratchet [passes](http://socketo.me/reports/ab/) the [Autobahn Testsuite](http://autobahn.ws/testsuite) (non-binary messages) ##Requirements diff --git a/composer.lock b/composer.lock index fba7c14..ec801f4 100644 --- a/composer.lock +++ b/composer.lock @@ -47,17 +47,17 @@ }, { "name": "guzzle/common", - "version": "v3.7.3", + "version": "v3.7.4", "target-dir": "Guzzle/Common", "source": { "type": "git", "url": "https://github.com/guzzle/common.git", - "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306" + "reference": "5126e268446c7e7df961b89128d71878e0652432" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/common/zipball/bf73c87375f60861f8c7ccc7b95878023ade5306", - "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306", + "url": "https://api.github.com/repos/guzzle/common/zipball/5126e268446c7e7df961b89128d71878e0652432", + "reference": "5126e268446c7e7df961b89128d71878e0652432", "shasum": "" }, "require": { @@ -87,21 +87,21 @@ "event", "exception" ], - "time": "2013-09-08 21:09:18" + "time": "2013-10-02 20:47:00" }, { "name": "guzzle/http", - "version": "v3.7.3", + "version": "v3.7.4", "target-dir": "Guzzle/Http", "source": { "type": "git", "url": "https://github.com/guzzle/http.git", - "reference": "1034125dfd906b73119e535f03153a62fccb1989" + "reference": "3420035adcf312d62a2e64f3e6b3e3e590121786" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/guzzle/http/zipball/1034125dfd906b73119e535f03153a62fccb1989", - "reference": "1034125dfd906b73119e535f03153a62fccb1989", + "url": "https://api.github.com/repos/guzzle/http/zipball/3420035adcf312d62a2e64f3e6b3e3e590121786", + "reference": "3420035adcf312d62a2e64f3e6b3e3e590121786", "shasum": "" }, "require": { @@ -144,11 +144,11 @@ "http", "http client" ], - "time": "2013-09-06 11:34:26" + "time": "2013-09-20 22:05:53" }, { "name": "guzzle/parser", - "version": "v3.7.3", + "version": "v3.7.4", "target-dir": "Guzzle/Parser", "source": { "type": "git", @@ -192,7 +192,7 @@ }, { "name": "guzzle/stream", - "version": "v3.7.3", + "version": "v3.7.4", "target-dir": "Guzzle/Stream", "source": { "type": "git", @@ -375,7 +375,7 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.3.5", + "version": "v2.3.6", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", @@ -429,17 +429,17 @@ }, { "name": "symfony/http-foundation", - "version": "v2.3.4", + "version": "v2.3.6", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation.git", - "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c" + "reference": "59e712338cd05463ebcb8da6422a01b1291871e3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/fdf130fe65457aedbc4639a22f4ef9d3be5c002c", - "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c", + "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/59e712338cd05463ebcb8da6422a01b1291871e3", + "reference": "59e712338cd05463ebcb8da6422a01b1291871e3", "shasum": "" }, "require": { @@ -475,21 +475,21 @@ ], "description": "Symfony HttpFoundation Component", "homepage": "http://symfony.com", - "time": "2013-08-26 05:49:51" + "time": "2013-09-29 19:41:41" }, { "name": "symfony/routing", - "version": "v2.3.5", + "version": "v2.3.6", "target-dir": "Symfony/Component/Routing", "source": { "type": "git", "url": "https://github.com/symfony/Routing.git", - "reference": "6d1f7b101337594fe790c47166068583b60b6460" + "reference": "7d41463094752e87a0fae60316d236abecb8a034" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/symfony/Routing/zipball/6d1f7b101337594fe790c47166068583b60b6460", - "reference": "6d1f7b101337594fe790c47166068583b60b6460", + "url": "https://api.github.com/repos/symfony/Routing/zipball/7d41463094752e87a0fae60316d236abecb8a034", + "reference": "7d41463094752e87a0fae60316d236abecb8a034", "shasum": "" }, "require": { @@ -533,7 +533,7 @@ ], "description": "Symfony Routing Component", "homepage": "http://symfony.com", - "time": "2013-09-19 09:45:20" + "time": "2013-09-29 19:41:41" } ], "packages-dev": [ diff --git a/src/Ratchet/ConnectionInterface.php b/src/Ratchet/ConnectionInterface.php index 088823d..5cf8e71 100644 --- a/src/Ratchet/ConnectionInterface.php +++ b/src/Ratchet/ConnectionInterface.php @@ -5,7 +5,7 @@ namespace Ratchet; * The version of Ratchet being used * @var string */ -const VERSION = 'Ratchet/0.3-beta'; +const VERSION = 'Ratchet/0.3'; /** * A proxy object representing a connection to the application