Merge branch 'websocket'
Project: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/repo Commit: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/commit/1d733834 Tree: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/tree/1d733834 Diff: http://git-wip-us.apache.org/repos/asf/couchdb-mochiweb/diff/1d733834 Branch: refs/heads/1843-feature-bigcouch Commit: 1d7338345360cb4de426fed69b6b2d005f2ac9f8 Parents: 31efc60 6ab8d83 Author: Bob Ippolito <[email protected]> Authored: Thu Jan 2 00:28:14 2014 -0800 Committer: Bob Ippolito <[email protected]> Committed: Thu Jan 2 00:28:14 2014 -0800 ---------------------------------------------------------------------- .gitignore | 2 + CHANGES.md | 8 + examples/websocket/index.html | 59 +++++++ examples/websocket/websocket.erl | 148 +++++++++++++++++ src/mochiweb.app.src | 2 +- src/mochiweb_request_tests.erl | 182 --------------------- src/mochiweb_websocket.erl | 286 +++++++++++++++++++++++++++++++++ test/mochiweb_request_tests.erl | 182 +++++++++++++++++++++ test/mochiweb_websocket_tests.erl | 84 ++++++++++ 9 files changed, 770 insertions(+), 183 deletions(-) ----------------------------------------------------------------------
