faeez/mxmbsocket
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Repo. Project Releases Wiki Activity

Merge branch 'refs/heads/master' into 0.3

Browse Source 
Conflicts:
	CHANGELOG.md
	composer.json
	composer.lock
This commit is contained in:
Chris Boden 2013-10-05 10:08:51 -04:00
commit 2206a9fc83
2 changed files with 43 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@ -18,6 +18,10 @@ CHANGELOG
* BF: Single sub-protocol selection to conform with RFC6455 * BF: Single sub-protocol selection to conform with RFC6455
* BF: Sanity checks on WAMP protocol to prevent errors * BF: Sanity checks on WAMP protocol to prevent errors
* 0.2.8 (2013-09-19)
* React 0.3 support
* 0.2.7 (2013-06-09) * 0.2.7 (2013-06-09)
* BF: Sub-protocol negotation with Guzzle 3.6 * BF: Sub-protocol negotation with Guzzle 3.6
@ -91,5 +95,9 @@ CHANGELOG
* 0.1 (2012-05-11) * 0.1 (2012-05-11)
* First release with components: IoServer, WsServer, SessionProvider, WampServer, FlashPolicy, IpBlackList * 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
=======
* I/O now handled by React, making Ratchet fully asynchronous
>>>>>>> refs/heads/master

70
composer.lock generated
View File

@ -47,17 +47,17 @@
}, },
{ {
"name": "guzzle/common", "name": "guzzle/common",
"version": "v3.7.1", "version": "v3.7.3",
"target-dir": "Guzzle/Common", "target-dir": "Guzzle/Common",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/common.git", "url": "https://github.com/guzzle/common.git",
"reference": "v3.7.1" "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/common/zipball/v3.7.1", "url": "https://api.github.com/repos/guzzle/common/zipball/bf73c87375f60861f8c7ccc7b95878023ade5306",
"reference": "v3.7.1", "reference": "bf73c87375f60861f8c7ccc7b95878023ade5306",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -87,21 +87,21 @@
"event", "event",
"exception" "exception"
], ],
"time": "2013-07-05 20:17:54" "time": "2013-09-08 21:09:18"
}, },
{ {
"name": "guzzle/http", "name": "guzzle/http",
"version": "v3.7.1", "version": "v3.7.3",
"target-dir": "Guzzle/Http", "target-dir": "Guzzle/Http",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/http.git", "url": "https://github.com/guzzle/http.git",
"reference": "v3.7.1" "reference": "1034125dfd906b73119e535f03153a62fccb1989"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/http/zipball/v3.7.1", "url": "https://api.github.com/repos/guzzle/http/zipball/1034125dfd906b73119e535f03153a62fccb1989",
"reference": "v3.7.1", "reference": "1034125dfd906b73119e535f03153a62fccb1989",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -144,21 +144,21 @@
"http", "http",
"http client" "http client"
], ],
"time": "2013-07-02 19:53:26" "time": "2013-09-06 11:34:26"
}, },
{ {
"name": "guzzle/parser", "name": "guzzle/parser",
"version": "v3.7.1", "version": "v3.7.3",
"target-dir": "Guzzle/Parser", "target-dir": "Guzzle/Parser",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/parser.git", "url": "https://github.com/guzzle/parser.git",
"reference": "v3.7.1" "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/parser/zipball/v3.7.1", "url": "https://api.github.com/repos/guzzle/parser/zipball/a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2",
"reference": "v3.7.1", "reference": "a25c2ddda1c52fb69a4ee56eb530b13ddd9573c2",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -188,21 +188,21 @@
"message", "message",
"url" "url"
], ],
"time": "2013-06-11 00:24:07" "time": "2013-07-11 22:46:03"
}, },
{ {
"name": "guzzle/stream", "name": "guzzle/stream",
"version": "v3.7.1", "version": "v3.7.3",
"target-dir": "Guzzle/Stream", "target-dir": "Guzzle/Stream",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/guzzle/stream.git", "url": "https://github.com/guzzle/stream.git",
"reference": "v3.7.1" "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/guzzle/stream/zipball/v3.7.1", "url": "https://api.github.com/repos/guzzle/stream/zipball/a86111d9ac7db31d65a053c825869409fe8fc83f",
"reference": "v3.7.1", "reference": "a86111d9ac7db31d65a053c825869409fe8fc83f",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -241,7 +241,7 @@
"component", "component",
"stream" "stream"
], ],
"time": "2013-06-27 00:50:43" "time": "2013-07-30 22:07:23"
}, },
{ {
"name": "react/event-loop", "name": "react/event-loop",
@ -375,17 +375,17 @@
}, },
{ {
"name": "symfony/event-dispatcher", "name": "symfony/event-dispatcher",
"version": "v2.3.2", "version": "v2.3.5",
"target-dir": "Symfony/Component/EventDispatcher", "target-dir": "Symfony/Component/EventDispatcher",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/EventDispatcher.git", "url": "https://github.com/symfony/EventDispatcher.git",
"reference": "v2.3.2" "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/v2.3.2", "url": "https://api.github.com/repos/symfony/EventDispatcher/zipball/7fc72a7a346a1887d3968cc1ce5642a15cd182e9",
"reference": "v2.3.2", "reference": "7fc72a7a346a1887d3968cc1ce5642a15cd182e9",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -425,21 +425,21 @@
], ],
"description": "Symfony EventDispatcher Component", "description": "Symfony EventDispatcher Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-05-13 14:36:40" "time": "2013-09-19 09:45:20"
}, },
{ {
"name": "symfony/http-foundation", "name": "symfony/http-foundation",
"version": "v2.3.2", "version": "v2.3.4",
"target-dir": "Symfony/Component/HttpFoundation", "target-dir": "Symfony/Component/HttpFoundation",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/HttpFoundation.git", "url": "https://github.com/symfony/HttpFoundation.git",
"reference": "v2.3.2" "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/v2.3.2", "url": "https://api.github.com/repos/symfony/HttpFoundation/zipball/fdf130fe65457aedbc4639a22f4ef9d3be5c002c",
"reference": "v2.3.2", "reference": "fdf130fe65457aedbc4639a22f4ef9d3be5c002c",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -475,21 +475,21 @@
], ],
"description": "Symfony HttpFoundation Component", "description": "Symfony HttpFoundation Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-07-17 05:57:53" "time": "2013-08-26 05:49:51"
}, },
{ {
"name": "symfony/routing", "name": "symfony/routing",
"version": "v2.3.2", "version": "v2.3.5",
"target-dir": "Symfony/Component/Routing", "target-dir": "Symfony/Component/Routing",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://github.com/symfony/Routing.git", "url": "https://github.com/symfony/Routing.git",
"reference": "v2.3.2" "reference": "6d1f7b101337594fe790c47166068583b60b6460"
}, },
"dist": { "dist": {
"type": "zip", "type": "zip",
"url": "https://api.github.com/repos/symfony/Routing/zipball/v2.3.2", "url": "https://api.github.com/repos/symfony/Routing/zipball/6d1f7b101337594fe790c47166068583b60b6460",
"reference": "v2.3.2", "reference": "6d1f7b101337594fe790c47166068583b60b6460",
"shasum": "" "shasum": ""
}, },
"require": { "require": {
@ -533,7 +533,7 @@
], ],
"description": "Symfony Routing Component", "description": "Symfony Routing Component",
"homepage": "http://symfony.com", "homepage": "http://symfony.com",
"time": "2013-06-23 08:16:02" "time": "2013-09-19 09:45:20"
} }
], ],
"packages-dev": [ "packages-dev": [