From ffd29053bd50a3b1f45f322ed3fc2e1e11572656 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 5 Jan 2013 13:04:43 -0500 Subject: [PATCH] Minor updates --- composer.json | 3 +- composer.lock | 137 ++++++++++-------- .../WebSocket/Version/RFC6455/Connection.php | 1 - 3 files changed, 81 insertions(+), 60 deletions(-) diff --git a/composer.json b/composer.json index 3ae5696..787551c 100644 --- a/composer.json +++ b/composer.json @@ -14,8 +14,9 @@ } ] , "support": { - "forum": "https://groups.google.com/forum/#!forum/ratchet-php" + "forum": "https://groups.google.com/forum/#!forum/ratchet-php" , "issues": "https://github.com/cboden/Ratchet/issues" + , "irc": "irc://irc.freenode.org/reactphp" } , "autoload": { "psr-0": { diff --git a/composer.lock b/composer.lock index 51c3917..cbc3e18 100644 --- a/composer.lock +++ b/composer.lock @@ -1,5 +1,5 @@ { - "hash": "4c2eebe4dcb77d26958ef1152642327d", + "hash": "fad48a754b78c8c7c67e7ca1448d48ec", "packages": [ { "name": "evenement/evenement", @@ -43,31 +43,37 @@ }, { "name": "guzzle/common", - "version": "v3.0.5", + "version": "v3.0.7", "target-dir": "Guzzle/Common", "source": { "type": "git", "url": "git://github.com/guzzle/common.git", - "reference": "v3.0.5" + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/common/archive/v3.0.5.zip", - "reference": "v3.0.5", + "url": "https://github.com/guzzle/common/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { "php": ">=5.3.2", - "symfony/event-dispatcher": "2.1.*" + "symfony/event-dispatcher": ">=2.1" }, - "time": "2012-11-19 00:15:33", + "time": "2012-12-19 23:06:35", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "installation-source": "dist", "autoload": { "psr-0": { "Guzzle\\Common": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -82,33 +88,40 @@ }, { "name": "guzzle/http", - "version": "v3.0.5", + "version": "v3.0.7", "target-dir": "Guzzle/Http", "source": { "type": "git", "url": "git://github.com/guzzle/http.git", - "reference": "v3.0.5" + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/http/archive/v3.0.5.zip", - "reference": "v3.0.5", + "url": "https://github.com/guzzle/http/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { "php": ">=5.3.2", + "ext-curl": "*", "guzzle/common": "self.version", "guzzle/parser": "self.version", "guzzle/stream": "self.version" }, - "time": "2012-11-18 05:28:55", + "time": "2012-12-14 00:49:17", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "installation-source": "dist", "autoload": { "psr-0": { "Guzzle\\Http": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -131,30 +144,36 @@ }, { "name": "guzzle/parser", - "version": "v3.0.5", + "version": "v3.0.7", "target-dir": "Guzzle/Parser", "source": { "type": "git", "url": "git://github.com/guzzle/parser.git", - "reference": "v3.0.5" + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/parser/archive/v3.0.5.zip", - "reference": "v3.0.5", + "url": "https://github.com/guzzle/parser/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { "php": ">=5.3.2" }, - "time": "2012-11-19 00:07:13", + "time": "2012-12-07 16:45:11", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "installation-source": "dist", "autoload": { "psr-0": { "Guzzle\\Parser": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -170,31 +189,37 @@ }, { "name": "guzzle/stream", - "version": "v3.0.5", + "version": "v3.0.7", "target-dir": "Guzzle/Stream", "source": { "type": "git", "url": "https://github.com/guzzle/stream", - "reference": "v3.0.5" + "reference": "v3.0.7" }, "dist": { "type": "zip", - "url": "https://github.com/guzzle/stream/archive/v3.0.5.zip", - "reference": "v3.0.5", + "url": "https://github.com/guzzle/stream/archive/v3.0.7.zip", + "reference": "v3.0.7", "shasum": "" }, "require": { "php": ">=5.3.2", "guzzle/common": "self.version" }, - "time": "2012-11-11 23:54:57", + "time": "2012-12-07 16:45:11", "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, "installation-source": "dist", "autoload": { "psr-0": { "Guzzle\\Stream": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -215,17 +240,17 @@ }, { "name": "react/event-loop", - "version": "v0.2.4", + "version": "v0.2.7", "target-dir": "React/EventLoop", "source": { "type": "git", "url": "https://github.com/reactphp/event-loop", - "reference": "v0.2.4" + "reference": "v0.2.7" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/event-loop/archive/v0.2.4.zip", - "reference": "v0.2.4", + "url": "https://github.com/reactphp/event-loop/archive/v0.2.7.zip", + "reference": "v0.2.7", "shasum": "" }, "require": { @@ -235,7 +260,7 @@ "ext-libevent": ">=0.0.5", "ext-libev": "*" }, - "time": "2012-11-12 23:00:05", + "time": "2013-01-05 11:41:26", "type": "library", "extra": { "branch-alias": { @@ -248,6 +273,7 @@ "React\\EventLoop": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -258,17 +284,17 @@ }, { "name": "react/socket", - "version": "v0.2.4", + "version": "v0.2.7", "target-dir": "React/Socket", "source": { "type": "git", "url": "https://github.com/reactphp/socket", - "reference": "v0.2.4" + "reference": "v0.2.7" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/socket/archive/v0.2.4.zip", - "reference": "v0.2.4", + "url": "https://github.com/reactphp/socket/archive/v0.2.7.zip", + "reference": "v0.2.7", "shasum": "" }, "require": { @@ -277,7 +303,7 @@ "react/event-loop": "0.2.*", "react/stream": "0.2.*" }, - "time": "2012-11-05 13:25:35", + "time": "2012-12-14 00:58:14", "type": "library", "extra": { "branch-alias": { @@ -290,6 +316,7 @@ "React\\Socket": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -300,17 +327,17 @@ }, { "name": "react/stream", - "version": "v0.2.4", + "version": "v0.2.7", "target-dir": "React/Stream", "source": { "type": "git", "url": "https://github.com/reactphp/stream", - "reference": "v0.2.4" + "reference": "v0.2.7" }, "dist": { "type": "zip", - "url": "https://github.com/reactphp/stream/archive/v0.2.4.zip", - "reference": "v0.2.4", + "url": "https://github.com/reactphp/stream/archive/v0.2.7.zip", + "reference": "v0.2.7", "shasum": "" }, "require": { @@ -318,9 +345,10 @@ "evenement/evenement": "1.0.*" }, "suggest": { - "react/event-loop": "0.2.*" + "react/event-loop": "0.2.*", + "react/promise": "1.0.*" }, - "time": "2012-11-18 00:18:39", + "time": "2012-12-14 00:58:14", "type": "library", "extra": { "branch-alias": { @@ -333,6 +361,7 @@ "React\\Stream": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -344,17 +373,17 @@ }, { "name": "symfony/event-dispatcher", - "version": "v2.1.3", + "version": "v2.1.6", "target-dir": "Symfony/Component/EventDispatcher", "source": { "type": "git", "url": "https://github.com/symfony/EventDispatcher", - "reference": "v2.1.3" + "reference": "v2.1.6" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/EventDispatcher/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/symfony/EventDispatcher/archive/v2.1.6.zip", + "reference": "v2.1.6", "shasum": "" }, "require": { @@ -367,19 +396,15 @@ "symfony/dependency-injection": "2.1.*", "symfony/http-kernel": "2.1.*" }, - "time": "2012-10-04 08:17:57", + "time": "2012-12-06 10:00:55", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "installation-source": "dist", "autoload": { "psr-0": { "Symfony\\Component\\EventDispatcher": "" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], @@ -398,29 +423,24 @@ }, { "name": "symfony/http-foundation", - "version": "v2.1.3", + "version": "v2.1.6", "target-dir": "Symfony/Component/HttpFoundation", "source": { "type": "git", "url": "https://github.com/symfony/HttpFoundation", - "reference": "v2.1.3" + "reference": "v2.1.6" }, "dist": { "type": "zip", - "url": "https://github.com/symfony/HttpFoundation/zipball/v2.1.3", - "reference": "v2.1.3", + "url": "https://github.com/symfony/HttpFoundation/archive/v2.1.6.zip", + "reference": "v2.1.6", "shasum": "" }, "require": { "php": ">=5.3.3" }, - "time": "2012-10-20 00:10:30", + "time": "2012-12-14 21:03:29", "type": "library", - "extra": { - "branch-alias": { - "dev-master": "2.1-dev" - } - }, "installation-source": "dist", "autoload": { "psr-0": { @@ -428,6 +448,7 @@ "SessionHandlerInterface": "Symfony/Component/HttpFoundation/Resources/stubs" } }, + "notification-url": "https://packagist.org/downloads/", "license": [ "MIT" ], diff --git a/src/Ratchet/WebSocket/Version/RFC6455/Connection.php b/src/Ratchet/WebSocket/Version/RFC6455/Connection.php index c05d643..279bd57 100644 --- a/src/Ratchet/WebSocket/Version/RFC6455/Connection.php +++ b/src/Ratchet/WebSocket/Version/RFC6455/Connection.php @@ -1,6 +1,5 @@