From 78d19f6132cef3e2666b3e7deac81ac0d4612f6e Mon Sep 17 00:00:00 2001 From: James Aimonetti Date: Thu, 19 Jun 2014 16:14:15 -0700 Subject: [PATCH] 3.12: upgrade cowboy to 0.10.0 and refresh Crossbar --- applications/Makefile | 3 - applications/crossbar/src/api_util.erl | 77 +- applications/crossbar/src/cb_context.erl | 2 +- core/Makefile | 3 - core/whistle_transactions-1.0.0/Makefile | 1 - deps/Makefile | 10 +- deps/{cowboy-0.9.0 => cowboy-0.10.0}/AUTHORS | 11 +- .../CHANGELOG.md | 82 ++ .../CONTRIBUTING.md | 0 deps/{cowlib-0.4.0 => cowboy-0.10.0}/LICENSE | 2 +- deps/{cowboy-0.9.0 => cowboy-0.10.0}/Makefile | 6 +- .../{cowboy-0.9.0 => cowboy-0.10.0}/README.md | 9 +- deps/cowboy-0.10.0/ROADMAP.md | 40 + deps/cowboy-0.10.0/all.sh | 19 + deps/cowboy-0.10.0/deps/cowlib | 1 + deps/cowboy-0.10.0/deps/ranch | 1 + .../examples/README.md | 5 +- .../examples/chunked_hello_world/Makefile | 0 .../examples/chunked_hello_world/README.md | 0 .../examples/chunked_hello_world/relx.config | 0 .../src/chunked_hello_world.app.src | 0 .../src/chunked_hello_world_app.erl | 0 .../src/chunked_hello_world_sup.erl | 0 .../src/toppage_handler.erl | 0 .../examples/compress_response/Makefile | 0 .../examples/compress_response/README.md | 0 .../examples/compress_response/relx.config | 0 .../src/compress_response.app.src | 0 .../src/compress_response_app.erl | 0 .../src/compress_response_sup.erl | 0 .../compress_response/src/toppage_handler.erl | 0 .../examples/cookie/Makefile | 0 .../examples/cookie/README.md | 0 .../examples/cookie/relx.config | 0 .../examples/cookie/src/cookie.app.src | 0 .../examples/cookie/src/cookie_app.erl | 0 .../examples/cookie/src/cookie_sup.erl | 0 .../examples/cookie/src/toppage_handler.erl | 0 .../examples/cookie/templates/toppage.dtl | 0 .../examples/echo_get/Makefile | 0 .../examples/echo_get/README.md | 2 +- .../examples/echo_get/relx.config | 0 .../examples/echo_get/src/echo_get.app.src | 0 .../examples/echo_get/src/echo_get_app.erl | 0 .../examples/echo_get/src/echo_get_sup.erl | 0 .../examples/echo_get/src/toppage_handler.erl | 0 .../examples/echo_post/Makefile | 0 .../examples/echo_post/README.md | 0 .../examples/echo_post/relx.config | 0 .../examples/echo_post/src/echo_post.app.src | 0 .../examples/echo_post/src/echo_post_app.erl | 0 .../examples/echo_post/src/echo_post_sup.erl | 0 .../echo_post/src/toppage_handler.erl | 0 .../examples/error_hook/Makefile | 0 .../examples/error_hook/README.md | 0 .../examples/error_hook/relx.config | 0 .../error_hook/src/error_hook.app.src | 0 .../error_hook/src/error_hook_app.erl | 0 .../error_hook/src/error_hook_sup.erl | 0 .../examples/eventsource/Makefile | 0 .../examples/eventsource/README.md | 0 .../examples/eventsource/priv/index.html | 0 .../examples/eventsource/relx.config | 0 .../eventsource/src/eventsource.app.src | 0 .../eventsource/src/eventsource_app.erl | 0 .../eventsource/src/eventsource_handler.erl | 0 .../eventsource/src/eventsource_sup.erl | 0 .../examples/hello_world/Makefile | 0 .../examples/hello_world/README.md | 0 .../examples/hello_world/relx.config | 0 .../hello_world/src/hello_world.app.src | 0 .../hello_world/src/hello_world_app.erl | 0 .../hello_world/src/hello_world_sup.erl | 0 .../hello_world/src/toppage_handler.erl | 0 .../examples/markdown_middleware/Makefile | 0 .../examples/markdown_middleware/README.md | 0 .../markdown_middleware/priv/small.mp4 | Bin .../markdown_middleware/priv/small.ogv | Bin .../markdown_middleware/priv/video.md | 0 .../examples/markdown_middleware/relx.config | 0 .../markdown_middleware/src/erlmarkdown.erl | 0 .../src/markdown_converter.erl | 0 .../src/markdown_middleware.app.src | 0 .../src/markdown_middleware_app.erl | 0 .../src/markdown_middleware_sup.erl | 0 .../examples/rest_basic_auth/Makefile | 0 .../examples/rest_basic_auth/README.md | 0 .../examples/rest_basic_auth/relx.config | 0 .../src/rest_basic_auth.app.src | 0 .../src/rest_basic_auth_app.erl | 0 .../src/rest_basic_auth_sup.erl | 0 .../rest_basic_auth/src/toppage_handler.erl | 0 .../examples/rest_hello_world/Makefile | 0 .../examples/rest_hello_world/README.md | 0 .../examples/rest_hello_world/relx.config | 0 .../src/rest_hello_world.app.src | 0 .../src/rest_hello_world_app.erl | 0 .../src/rest_hello_world_sup.erl | 0 .../rest_hello_world/src/toppage_handler.erl | 0 .../examples/rest_pastebin/Makefile | 0 .../examples/rest_pastebin/README.md | 0 .../examples/rest_pastebin/priv/index.html | 0 .../examples/rest_pastebin/priv/index.txt | 0 .../examples/rest_pastebin/relx.config | 0 .../rest_pastebin/src/rest_pastebin.app.src | 0 .../rest_pastebin/src/rest_pastebin_app.erl | 0 .../rest_pastebin/src/rest_pastebin_sup.erl | 0 .../rest_pastebin/src/toppage_handler.erl | 0 .../examples/rest_stream_response/Makefile | 0 .../examples/rest_stream_response/README.md | 0 .../examples/rest_stream_response/relx.config | 0 .../src/rest_stream_response.app.src | 0 .../src/rest_stream_response_app.erl | 0 .../src/rest_stream_response_sup.erl | 0 .../src/toppage_handler.erl | 0 .../examples/ssl_hello_world/Makefile | 0 .../examples/ssl_hello_world/README.md | 2 +- .../ssl_hello_world/priv/ssl/cowboy-ca.crt | 0 .../ssl_hello_world/priv/ssl/server.crt | 0 .../ssl_hello_world/priv/ssl/server.key | 0 .../examples/ssl_hello_world/relx.config | 0 .../src/ssl_hello_world.app.src | 0 .../src/ssl_hello_world_app.erl | 0 .../src/ssl_hello_world_sup.erl | 0 .../ssl_hello_world/src/toppage_handler.erl | 0 .../examples/static_world/Makefile | 0 .../examples/static_world/README.md | 0 .../examples/static_world/priv/small.mp4 | Bin .../examples/static_world/priv/small.ogv | Bin .../examples/static_world/priv/test.txt | 0 .../examples/static_world/priv/video.html | 0 .../examples/static_world/relx.config | 0 .../static_world/src/static_world.app.src | 0 .../static_world/src/static_world_app.erl | 0 .../static_world/src/static_world_sup.erl | 0 deps/cowboy-0.10.0/examples/upload/Makefile | 6 + deps/cowboy-0.10.0/examples/upload/README.md | 20 + .../examples/upload/priv/index.html | 13 + .../cowboy-0.10.0/examples/upload/relx.config | 2 + .../examples/upload/src/upload.app.src | 15 + .../examples/upload/src/upload_app.erl | 25 + .../examples/upload/src/upload_handler.erl | 21 + .../examples/upload/src/upload_sup.erl | 23 + .../examples/web_server/Makefile | 0 .../examples/web_server/README.md | 0 .../examples/web_server/priv/small.mp4 | Bin .../examples/web_server/priv/small.ogv | Bin .../examples/web_server/priv/test.txt | 0 .../examples/web_server/priv/video.html | 0 .../examples/web_server/relx.config | 0 .../web_server/src/directory_handler.erl | 0 .../web_server/src/directory_lister.erl | 0 .../web_server/src/web_server.app.src | 0 .../web_server/src/web_server_app.erl | 0 .../web_server/src/web_server_sup.erl | 0 .../examples/websocket/Makefile | 0 .../examples/websocket/README.md | 0 .../examples/websocket/priv/index.html | 3 +- .../websocket/priv/static/jquery.min.js | 2 +- .../examples/websocket/relx.config | 0 .../examples/websocket/src/websocket.app.src | 0 .../examples/websocket/src/websocket_app.erl | 0 .../examples/websocket/src/websocket_sup.erl | 0 .../examples/websocket/src/ws_handler.erl | 0 .../guide/cookies.md | 0 .../guide/erlang_beginners.md | 0 .../guide/erlang_web.md | 0 .../guide/getting_started.md | 4 +- .../guide/handlers.md | 0 .../guide/hooks.md | 0 .../guide/http_handlers.md | 0 .../guide/http_req_life.md | 0 .../guide/http_req_resp.png | Bin .../guide/http_req_resp.svg | 0 .../guide/internals.md | 0 .../guide/introduction.md | 0 .../guide/loop_handlers.md | 0 .../guide/middlewares.md | 0 .../guide/modern_web.md | 0 deps/cowboy-0.10.0/guide/multipart_req.md | 119 +++ .../guide/req.md | 15 +- deps/cowboy-0.10.0/guide/req_body.md | 166 ++++ .../guide/resources.md | 0 .../guide/resp.md | 0 .../guide/rest_handlers.md | 0 deps/cowboy-0.10.0/guide/rest_principles.md | 163 ++++ .../guide/routing.md | 0 .../guide/static_handlers.md | 0 .../guide/toc.md | 10 +- deps/cowboy-0.10.0/guide/ws_handlers.md | 230 ++++++ deps/cowboy-0.10.0/guide/ws_protocol.md | 45 + .../manual/cowboy.md | 2 +- .../manual/cowboy_app.md | 5 +- .../manual/cowboy_handler.md | 0 .../manual/cowboy_http_handler.md | 0 .../manual/cowboy_loop_handler.md | 0 .../manual/cowboy_middleware.md | 0 .../manual/cowboy_protocol.md | 0 .../manual/cowboy_req.md | 194 +++-- .../manual/cowboy_rest.md | 9 +- .../manual/cowboy_router.md | 0 .../manual/cowboy_spdy.md | 0 .../manual/cowboy_static.md | 0 .../manual/cowboy_sub_protocol.md | 0 .../manual/cowboy_websocket.md | 0 .../manual/cowboy_websocket_handler.md | 0 .../manual/toc.md | 1 + .../src/cowboy.app.src | 4 +- .../src/cowboy.erl | 18 +- .../src/cowboy_app.erl | 12 +- .../src/cowboy_bstr.erl | 16 +- .../src/cowboy_clock.erl | 39 +- .../src/cowboy_handler.erl | 29 +- .../src/cowboy_http.erl | 278 +------ .../src/cowboy_http_handler.erl | 19 +- .../src/cowboy_loop_handler.erl | 25 +- .../src/cowboy_middleware.erl | 13 +- .../src/cowboy_protocol.erl | 118 +-- .../src/cowboy_req.erl | 778 +++++++----------- .../src/cowboy_rest.erl | 15 +- .../src/cowboy_router.erl | 49 +- .../src/cowboy_spdy.erl | 82 +- .../src/cowboy_static.erl | 19 +- .../src/cowboy_sub_protocol.erl | 16 +- .../src/cowboy_sup.erl | 16 +- .../src/cowboy_websocket.erl | 20 +- .../src/cowboy_websocket_handler.erl | 36 +- deps/cowboy-0.9.0/.gitignore | 13 - deps/cowboy-0.9.0/ROADMAP.md | 38 - deps/cowboy-0.9.0/doc/README.md | 10 - deps/cowboy-0.9.0/doc/overview.edoc | 4 - deps/cowboy-0.9.0/guide/req_body.md | 169 ---- deps/cowboy-0.9.0/guide/ws_handlers.md | 75 -- deps/cowboy-0.9.0/rebar.config | 4 - deps/cowboy-0.9.0/src/cowboy_client.erl | 275 ------- deps/cowboy-0.9.0/src/cowboy_multipart.erl | 313 ------- deps/cowlib-0.4.0/erlang.mk | 224 ----- deps/cowlib-0.4.0/src/cow_http.erl | 123 --- deps/{cowboy-0.9.0 => cowlib-0.6.2}/LICENSE | 2 +- deps/{cowlib-0.4.0 => cowlib-0.6.2}/Makefile | 3 +- deps/{cowlib-0.4.0 => cowlib-0.6.2}/README.md | 0 deps/cowlib-0.6.2/all.sh | 17 + deps/{ranch-0.9.0 => cowlib-0.6.2}/erlang.mk | 96 ++- deps/cowlib-0.6.2/include/cow_inline.hrl | 388 +++++++++ .../src/cow_cookie.erl | 25 +- .../src/cow_date.erl | 2 +- deps/cowlib-0.6.2/src/cow_http.erl | 301 +++++++ deps/cowlib-0.6.2/src/cow_http_hd.erl | 194 +++++ deps/cowlib-0.6.2/src/cow_http_te.erl | 309 +++++++ .../src/cow_mimetypes.erl | 2 +- .../src/cow_mimetypes.erl.src | 2 +- deps/cowlib-0.6.2/src/cow_multipart.erl | 710 ++++++++++++++++ .../src/cow_qs.erl | 2 +- .../src/cow_spdy.erl | 4 +- .../src/cow_spdy.hrl | 0 .../src/cowlib.app.src | 7 +- deps/{ranch-0.9.0 => ranch-0.10.0}/AUTHORS | 10 +- deps/{ranch-0.9.0 => ranch-0.10.0}/LICENSE | 0 deps/ranch-0.10.0/Makefile | 18 + deps/{ranch-0.9.0 => ranch-0.10.0}/README.md | 4 +- deps/{ranch-0.9.0 => ranch-0.10.0}/ROADMAP.md | 0 deps/ranch-0.10.0/all.sh | 19 + deps/{cowboy-0.9.0 => ranch-0.10.0}/erlang.mk | 26 +- deps/ranch-0.10.0/examples/tcp_echo/Makefile | 6 + deps/ranch-0.10.0/examples/tcp_echo/README.md | 27 + .../examples/tcp_echo/relx.config | 2 + .../examples/tcp_echo/src/echo_protocol.erl | 5 +- .../examples/tcp_echo/src/tcp_echo.app.src | 4 +- .../examples/tcp_echo/src/tcp_echo_app.erl | 0 .../examples/tcp_echo/src/tcp_echo_sup.erl | 0 .../examples/tcp_reverse/Makefile | 6 + .../examples/tcp_reverse/README.md | 33 + .../examples/tcp_reverse/relx.config | 2 + .../tcp_reverse/src/reverse_protocol.erl | 73 ++ .../tcp_reverse/src/tcp_reverse.app.src | 15 + .../tcp_reverse/src/tcp_reverse_app.erl | 19 + .../tcp_reverse/src/tcp_reverse_sup.erl | 22 + .../guide/embedded.md | 0 .../guide/internals.md | 32 +- deps/ranch-0.10.0/guide/introduction.md | 32 + .../guide/listeners.md | 7 +- deps/ranch-0.10.0/guide/parsers.md | 92 +++ .../guide/protocols.md | 0 .../guide/ssl_auth.md | 0 deps/ranch-0.10.0/guide/toc.md | 25 + .../guide/transports.md | 0 deps/ranch-0.10.0/manual/ranch.md | 171 ++++ deps/ranch-0.10.0/manual/ranch_app.md | 28 + deps/ranch-0.10.0/manual/ranch_protocol.md | 35 + deps/ranch-0.10.0/manual/ranch_ssl.md | 115 +++ deps/ranch-0.10.0/manual/ranch_tcp.md | 56 ++ deps/ranch-0.10.0/manual/ranch_transport.md | 205 +++++ deps/ranch-0.10.0/manual/toc.md | 11 + .../src/ranch.app.src | 4 +- .../src/ranch.erl | 100 +-- .../src/ranch_acceptor.erl | 10 +- .../src/ranch_acceptors_sup.erl | 10 +- .../src/ranch_app.erl | 11 +- .../src/ranch_conns_sup.erl | 93 ++- .../src/ranch_listener_sup.erl | 20 +- .../src/ranch_protocol.erl | 3 +- .../src/ranch_server.erl | 21 +- deps/ranch-0.10.0/src/ranch_ssl.erl | 210 +++++ .../src/ranch_sup.erl | 14 +- .../src/ranch_tcp.erl | 101 +-- .../src/ranch_transport.erl | 60 +- deps/ranch-0.9.0/.gitignore | 10 - deps/ranch-0.9.0/Makefile | 75 -- deps/ranch-0.9.0/doc/overview.edoc | 4 - deps/ranch-0.9.0/examples/tcp_echo/README.md | 18 - .../examples/tcp_echo/rebar.config | 4 - .../examples/tcp_echo/src/tcp_echo.erl | 12 - deps/ranch-0.9.0/examples/tcp_echo/start.sh | 3 - deps/ranch-0.9.0/guide/introduction.md | 25 - deps/ranch-0.9.0/guide/toc.md | 37 - deps/ranch-0.9.0/src/ranch_ssl.erl | 297 ------- 316 files changed, 5194 insertions(+), 3331 deletions(-) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/AUTHORS (91%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/CHANGELOG.md (90%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/CONTRIBUTING.md (100%) rename deps/{cowlib-0.4.0 => cowboy-0.10.0}/LICENSE (92%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/Makefile (90%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/README.md (86%) create mode 100644 deps/cowboy-0.10.0/ROADMAP.md create mode 100755 deps/cowboy-0.10.0/all.sh create mode 160000 deps/cowboy-0.10.0/deps/cowlib create mode 160000 deps/cowboy-0.10.0/deps/ranch rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/README.md (94%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/src/chunked_hello_world.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/src/chunked_hello_world_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/src/chunked_hello_world_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/chunked_hello_world/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/src/compress_response.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/src/compress_response_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/src/compress_response_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/compress_response/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/src/cookie.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/src/cookie_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/src/cookie_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/cookie/templates/toppage.dtl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/README.md (94%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/src/echo_get.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/src/echo_get_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/src/echo_get_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_get/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/src/echo_post.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/src/echo_post_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/src/echo_post_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/echo_post/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/src/error_hook.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/src/error_hook_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/error_hook/src/error_hook_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/priv/index.html (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/src/eventsource.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/src/eventsource_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/src/eventsource_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/eventsource/src/eventsource_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/src/hello_world.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/src/hello_world_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/src/hello_world_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/hello_world/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/priv/small.mp4 (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/priv/small.ogv (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/priv/video.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/src/erlmarkdown.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/src/markdown_converter.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/src/markdown_middleware.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/src/markdown_middleware_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/markdown_middleware/src/markdown_middleware_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/src/rest_basic_auth.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/src/rest_basic_auth_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/src/rest_basic_auth_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_basic_auth/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/src/rest_hello_world.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/src/rest_hello_world_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/src/rest_hello_world_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_hello_world/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/priv/index.html (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/priv/index.txt (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/src/rest_pastebin.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/src/rest_pastebin_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/src/rest_pastebin_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_pastebin/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/src/rest_stream_response.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/src/rest_stream_response_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/src/rest_stream_response_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/rest_stream_response/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/README.md (89%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/priv/ssl/cowboy-ca.crt (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/priv/ssl/server.crt (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/priv/ssl/server.key (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/src/ssl_hello_world.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/src/ssl_hello_world_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/src/ssl_hello_world_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/ssl_hello_world/src/toppage_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/priv/small.mp4 (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/priv/small.ogv (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/priv/test.txt (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/priv/video.html (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/src/static_world.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/src/static_world_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/static_world/src/static_world_sup.erl (100%) create mode 100644 deps/cowboy-0.10.0/examples/upload/Makefile create mode 100644 deps/cowboy-0.10.0/examples/upload/README.md create mode 100644 deps/cowboy-0.10.0/examples/upload/priv/index.html create mode 100644 deps/cowboy-0.10.0/examples/upload/relx.config create mode 100644 deps/cowboy-0.10.0/examples/upload/src/upload.app.src create mode 100644 deps/cowboy-0.10.0/examples/upload/src/upload_app.erl create mode 100644 deps/cowboy-0.10.0/examples/upload/src/upload_handler.erl create mode 100644 deps/cowboy-0.10.0/examples/upload/src/upload_sup.erl rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/priv/small.mp4 (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/priv/small.ogv (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/priv/test.txt (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/priv/video.html (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/src/directory_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/src/directory_lister.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/src/web_server.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/src/web_server_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/web_server/src/web_server_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/Makefile (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/README.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/priv/index.html (96%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/priv/static/jquery.min.js (99%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/relx.config (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/src/websocket.app.src (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/src/websocket_app.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/src/websocket_sup.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/examples/websocket/src/ws_handler.erl (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/cookies.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/erlang_beginners.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/erlang_web.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/getting_started.md (98%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/handlers.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/hooks.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/http_handlers.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/http_req_life.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/http_req_resp.png (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/http_req_resp.svg (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/internals.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/introduction.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/loop_handlers.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/middlewares.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/modern_web.md (100%) create mode 100644 deps/cowboy-0.10.0/guide/multipart_req.md rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/req.md (95%) create mode 100644 deps/cowboy-0.10.0/guide/req_body.md rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/resources.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/resp.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/rest_handlers.md (100%) create mode 100644 deps/cowboy-0.10.0/guide/rest_principles.md rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/routing.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/static_handlers.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/guide/toc.md (91%) create mode 100644 deps/cowboy-0.10.0/guide/ws_handlers.md create mode 100644 deps/cowboy-0.10.0/guide/ws_protocol.md rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy.md (98%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_app.md (78%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_handler.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_http_handler.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_loop_handler.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_middleware.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_protocol.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_req.md (73%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_rest.md (98%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_router.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_spdy.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_static.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_sub_protocol.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_websocket.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/cowboy_websocket_handler.md (100%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/manual/toc.md (95%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy.app.src (92%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy.erl (80%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_app.erl (85%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_bstr.erl (90%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_clock.erl (90%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_handler.erl (95%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_http.erl (77%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_http_handler.erl (64%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_loop_handler.erl (56%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_middleware.erl (65%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_protocol.erl (75%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_req.erl (68%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_rest.erl (98%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_router.erl (93%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_spdy.erl (84%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_static.erl (94%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_sub_protocol.erl (55%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_sup.erl (82%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_websocket.erl (98%) rename deps/{cowboy-0.9.0 => cowboy-0.10.0}/src/cowboy_websocket_handler.erl (52%) delete mode 100644 deps/cowboy-0.9.0/.gitignore delete mode 100644 deps/cowboy-0.9.0/ROADMAP.md delete mode 100644 deps/cowboy-0.9.0/doc/README.md delete mode 100644 deps/cowboy-0.9.0/doc/overview.edoc delete mode 100644 deps/cowboy-0.9.0/guide/req_body.md delete mode 100644 deps/cowboy-0.9.0/guide/ws_handlers.md delete mode 100644 deps/cowboy-0.9.0/rebar.config delete mode 100644 deps/cowboy-0.9.0/src/cowboy_client.erl delete mode 100644 deps/cowboy-0.9.0/src/cowboy_multipart.erl delete mode 100644 deps/cowlib-0.4.0/erlang.mk delete mode 100644 deps/cowlib-0.4.0/src/cow_http.erl rename deps/{cowboy-0.9.0 => cowlib-0.6.2}/LICENSE (92%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/Makefile (97%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/README.md (100%) create mode 100755 deps/cowlib-0.6.2/all.sh rename deps/{ranch-0.9.0 => cowlib-0.6.2}/erlang.mk (72%) create mode 100644 deps/cowlib-0.6.2/include/cow_inline.hrl rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_cookie.erl (87%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_date.erl (98%) create mode 100644 deps/cowlib-0.6.2/src/cow_http.erl create mode 100644 deps/cowlib-0.6.2/src/cow_http_hd.erl create mode 100644 deps/cowlib-0.6.2/src/cow_http_te.erl rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_mimetypes.erl (99%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_mimetypes.erl.src (97%) create mode 100644 deps/cowlib-0.6.2/src/cow_multipart.erl rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_qs.erl (99%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_spdy.erl (98%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cow_spdy.hrl (100%) rename deps/{cowlib-0.4.0 => cowlib-0.6.2}/src/cowlib.app.src (90%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/AUTHORS (89%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/LICENSE (100%) create mode 100644 deps/ranch-0.10.0/Makefile rename deps/{ranch-0.9.0 => ranch-0.10.0}/README.md (92%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/ROADMAP.md (100%) create mode 100755 deps/ranch-0.10.0/all.sh rename deps/{cowboy-0.9.0 => ranch-0.10.0}/erlang.mk (92%) create mode 100644 deps/ranch-0.10.0/examples/tcp_echo/Makefile create mode 100644 deps/ranch-0.10.0/examples/tcp_echo/README.md create mode 100644 deps/ranch-0.10.0/examples/tcp_echo/relx.config rename deps/{ranch-0.9.0 => ranch-0.10.0}/examples/tcp_echo/src/echo_protocol.erl (87%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/examples/tcp_echo/src/tcp_echo.app.src (73%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/examples/tcp_echo/src/tcp_echo_app.erl (100%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/examples/tcp_echo/src/tcp_echo_sup.erl (100%) create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/Makefile create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/README.md create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/relx.config create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/src/reverse_protocol.erl create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/src/tcp_reverse.app.src create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/src/tcp_reverse_app.erl create mode 100644 deps/ranch-0.10.0/examples/tcp_reverse/src/tcp_reverse_sup.erl rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/embedded.md (100%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/internals.md (75%) create mode 100644 deps/ranch-0.10.0/guide/introduction.md rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/listeners.md (98%) create mode 100644 deps/ranch-0.10.0/guide/parsers.md rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/protocols.md (100%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/ssl_auth.md (100%) create mode 100644 deps/ranch-0.10.0/guide/toc.md rename deps/{ranch-0.9.0 => ranch-0.10.0}/guide/transports.md (100%) create mode 100644 deps/ranch-0.10.0/manual/ranch.md create mode 100644 deps/ranch-0.10.0/manual/ranch_app.md create mode 100644 deps/ranch-0.10.0/manual/ranch_protocol.md create mode 100644 deps/ranch-0.10.0/manual/ranch_ssl.md create mode 100644 deps/ranch-0.10.0/manual/ranch_tcp.md create mode 100644 deps/ranch-0.10.0/manual/ranch_transport.md create mode 100644 deps/ranch-0.10.0/manual/toc.md rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch.app.src (92%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch.erl (55%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_acceptor.erl (94%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_acceptors_sup.erl (92%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_app.erl (87%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_conns_sup.erl (73%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_listener_sup.erl (81%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_protocol.erl (93%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_server.erl (87%) create mode 100644 deps/ranch-0.10.0/src/ranch_ssl.erl rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_sup.erl (83%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_tcp.erl (61%) rename deps/{ranch-0.9.0 => ranch-0.10.0}/src/ranch_transport.erl (76%) delete mode 100644 deps/ranch-0.9.0/.gitignore delete mode 100644 deps/ranch-0.9.0/Makefile delete mode 100644 deps/ranch-0.9.0/doc/overview.edoc delete mode 100644 deps/ranch-0.9.0/examples/tcp_echo/README.md delete mode 100644 deps/ranch-0.9.0/examples/tcp_echo/rebar.config delete mode 100644 deps/ranch-0.9.0/examples/tcp_echo/src/tcp_echo.erl delete mode 100755 deps/ranch-0.9.0/examples/tcp_echo/start.sh delete mode 100644 deps/ranch-0.9.0/guide/introduction.md delete mode 100644 deps/ranch-0.9.0/guide/toc.md delete mode 100644 deps/ranch-0.9.0/src/ranch_ssl.erl diff --git a/applications/Makefile b/applications/Makefile index c699d4cc6be..1e3063220e7 100644 --- a/applications/Makefile +++ b/applications/Makefile @@ -1,5 +1,4 @@ ROOT = ../ -REBAR = $(ROOT)/utils/rebar/rebar MAKEDIRS = */Makefile @@ -9,11 +8,9 @@ all: compile compile: ACTION = all compile: $(MAKEDIRS) - $(REBAR) compile clean: ACTION = clean clean: $(MAKEDIRS) - $(REBAR) clean $(MAKEDIRS): $(MAKE) -C $(@D) $(ACTION) diff --git a/applications/crossbar/src/api_util.erl b/applications/crossbar/src/api_util.erl index 39729bc2664..5fca12001c8 100644 --- a/applications/crossbar/src/api_util.erl +++ b/applications/crossbar/src/api_util.erl @@ -305,9 +305,11 @@ extract_file(Context, ContentType, Req0) -> {'ok', FileContents, Req1} -> %% http://tools.ietf.org/html/rfc2045#page-17 case cowboy_req:header(<<"content-transfer-encoding">>, Req1) of - {<<"base64">>, Req2} -> decode_base64(Context, ContentType, Req2); + {<<"base64">>, Req2} -> + lager:debug("base64 encoded request coming in"), + decode_base64(Context, ContentType, Req2); {_Else, Req2} -> - lager:debug("encoding: ~p", [_Else]), + lager:debug("unexpected transfer encoding: '~s'", [_Else]), {ContentLength, Req3} = cowboy_req:header(<<"content-length">>, Req2), Headers = wh_json:from_list([{<<"content_type">>, ContentType} ,{<<"content_length">>, ContentLength} @@ -338,6 +340,8 @@ default_filename() -> {cb_context:context(), cowboy_req:req()} | halt_return(). decode_base64(Context, CT, Req0) -> + decode_base64(Context, CT, Req0, []). +decode_base64(Context, CT, Req0, Body) -> case cowboy_req:body(Req0) of {'error', 'badlength'} -> lager:debug("the request body was most likely too big"), @@ -353,22 +357,28 @@ decode_base64(Context, CT, Req0) -> cb_context:set_resp_data(Context, E) ,'fatal' )); + {'more', BinData, Req1} -> + lager:debug("recv ~p bytes with more to come", [byte_size(BinData)]), + decode_base64(Context, CT, Req1, [BinData | Body]); {'ok', Base64Data, Req1} -> - {EncodedType, FileContents} = decode_base64(Base64Data), + Data = iolist_to_binary(lists:reverse([Base64Data | Body])), + + {EncodedType, FileContents} = decode_base64(Data), ContentType = case EncodedType of 'undefined' -> CT; <<"application/base64">> -> <<"application/octet-stream">>; Else -> Else end, Headers = wh_json:from_list([{<<"content_type">>, ContentType} - ,{<<"content_length">>, wh_util:to_binary(size(FileContents))} + ,{<<"content_length">>, byte_size(FileContents)} ]), FileJObj = wh_json:from_list([{<<"headers">>, Headers} ,{<<"contents">>, FileContents} ]), lager:debug("request is a base64 file upload of type: ~s", [ContentType]), FileName = <<"uploaded_file_" - ,(wh_util:to_binary(wh_util:current_tstamp()))/binary>>, + ,(wh_util:to_binary(wh_util:current_tstamp()))/binary + >>, {cb_context:set_req_files(Context, [{FileName, FileJObj}]), Req1} end. @@ -376,54 +386,45 @@ decode_base64(Context, CT, Req0) -> decode_base64(Base64) -> case binary:split(Base64, <<",">>) of %% http://tools.ietf.org/html/rfc4648 - [Bin] -> {'undefined', corrected_base64_decode(Bin)}; + [Bin] -> + lager:debug("not split on ','"), + {'undefined', corrected_base64_decode(Bin)}; %% http://tools.ietf.org/rfc/rfc2397.txt [<<"data:", CT/binary>>, Bin] -> {ContentType, _Opts} = mochiweb_util:parse_header(wh_util:to_list(CT)), - {wh_util:to_binary(ContentType), corrected_base64_decode(Bin)} + + {wh_util:to_binary(ContentType), corrected_base64_decode(Bin)}; + [_SplitLeft, _SplitRight] -> + lager:debug("split unexpectedly: ~p/~p", [byte_size(_SplitLeft), byte_size(_SplitRight)]), + lager:debug("l: ~s", [binary:part(_SplitLeft, byte_size(_SplitLeft), -20)]), + lager:debug("r: ~s", [binary:part(_SplitRight, byte_size(_SplitRight), -10)]), + {'undefined', corrected_base64_decode(Base64)} end. -spec corrected_base64_decode(ne_binary()) -> ne_binary(). corrected_base64_decode(Base64) when byte_size(Base64) rem 4 == 3 -> - base64:mime_decode(<>); corrected_base64_decode(Base64) when byte_size(Base64) rem 4 == 2 -> - base64:mime_decode(<>); + base64:mime_decode(<>); corrected_base64_decode(Base64) -> base64:mime_decode(Base64). --spec get_request_body(cowboy_req:req()) -> {binary(), cowboy_req:req()}. -get_request_body(Req0) -> +-spec get_request_body(cowboy_req:req()) -> + {binary(), cowboy_req:req()}. +-spec get_request_body(cowboy_req:req(), iolist()) -> + {binary(), cowboy_req:req()}. +get_request_body(Req) -> + get_request_body(Req, []). +get_request_body(Req0, Body) -> case cowboy_req:body(Req0) of - {'error', 'chunked'} -> - lager:debug("handling chunked request"), - handle_chunked(Req0); {'error', _E} -> lager:debug("request body had no payload: ~p", [_E]), {<<>>, Req0}; - {'ok', <<>>, Req1} -> - lager:debug("request body was empty"), - {<<>>, Req1}; - {'ok', ReqBody, Req1} -> - {ReqBody, Req1} - end. - --spec handle_chunked(cowboy_req:req()) -> {binary(), cowboy_req:req()}. -handle_chunked(Req) -> - handle_chunked(Req, <<>>). - --spec handle_chunked(cowboy_req:req(), binary()) -> {binary(), cowboy_req:req()}. -handle_chunked(Req, Body) -> - case cowboy_req:stream_body(Req) of - {'done', Req2} -> - {Body, Req2}; - {'ok', Data, Req2} -> - handle_chunked(Req2, <>); - {'error', 'timeout'} -> - lager:debug("timed out recv chunked request body, using none"), - {Body, Req}; - {'error', _E} -> - lager:debug("error while fetching chunk: ~p", [_E]), - {Body, Req} + {'more', Data, Req1} -> + lager:debug("recv chunk ~p bytes", [byte_size(Data)]), + get_request_body(Req1, [Body, Data]); + {'ok', Data, Req1} -> + {iolist_to_binary([Body, Data]), Req1} end. -type get_json_return() :: {wh_json:object(), cowboy_req:req()} | diff --git a/applications/crossbar/src/cb_context.erl b/applications/crossbar/src/cb_context.erl index 5e55aea0b89..36709eabb07 100644 --- a/applications/crossbar/src/cb_context.erl +++ b/applications/crossbar/src/cb_context.erl @@ -131,7 +131,7 @@ method(#cb_context{method=M}) -> M. -spec path_tokens(context()) -> ne_binaries(). path_tokens(#cb_context{raw_path=Path}) -> - [cowboy_http:urldecode(Token) || Token <- binary:split(Path, <<"/">>, ['global', 'trim'])]. + [cow_qs:urldecode(Token) || Token <- binary:split(Path, <<"/">>, ['global', 'trim'])]. -spec magic_pathed(context()) -> boolean(). magic_pathed(#cb_context{magic_pathed=MP}) -> MP. diff --git a/core/Makefile b/core/Makefile index e81dfb06e53..a5045cbb5d2 100644 --- a/core/Makefile +++ b/core/Makefile @@ -1,5 +1,4 @@ ROOT = ../ -REBAR = $(ROOT)/utils/rebar/rebar MAKEDIRS = */Makefile @@ -9,11 +8,9 @@ all: compile compile: ACTION = all compile: kazoo $(MAKEDIRS) - $(REBAR) compile clean: ACTION = clean clean: $(MAKEDIRS) - $(REBAR) clean kazoo: $(MAKE) -C whistle-1.0.0 compile diff --git a/core/whistle_transactions-1.0.0/Makefile b/core/whistle_transactions-1.0.0/Makefile index 7633a902c20..29b83555224 100644 --- a/core/whistle_transactions-1.0.0/Makefile +++ b/core/whistle_transactions-1.0.0/Makefile @@ -1,6 +1,5 @@ PROJECT = whistle_transactions ROOT = ../.. -REBAR = $(ROOT)/utils/rebar/rebar DIALYZER = dialyzer EBINS = $(shell find $(ROOT)/core -maxdepth 2 -name ebin -print) $(shell find $(ROOT)/deps -maxdepth 2 -name ebin -print) diff --git a/deps/Makefile b/deps/Makefile index 9e10e020538..4aabb03f0e8 100644 --- a/deps/Makefile +++ b/deps/Makefile @@ -3,6 +3,7 @@ ROOT = .. MAKEDIRS = rabbitmq_server-*/Makefile \ lager-*/Makefile \ ibrowse-*/Makefile \ + cowlib-*/Makefile \ */Makefile .PHONY: all compile clean $(MAKEDIRS) @@ -11,8 +12,8 @@ all: compile compile: ACTION = all compile: $(MAKEDIRS) - cp -a rabbitmq_server-3.2.0/plugins-src/rabbitmq-erlang-client rabbitmq_client-3.2.0 - rm -f rabbitmq_client-*/Makefile + cp -a rabbitmq_server-3.2.0/plugins-src/rabbitmq-erlang-client rabbitmq_client-3.2.0 + rm -f rabbitmq_client-*/Makefile clean: ACTION = clean clean: $(MAKEDIRS) @@ -21,6 +22,11 @@ clean: $(MAKEDIRS) rm -rf lager-2.0.0rc1 rm -rf rabbitmq_server-2.8.6 rm -rf goldrush-0.1.0 + rm -rf cowboy-0.8.4 + rm -rf cowboy-0.9.0 + rm -rf cowlib-0.4.0 + rm -rf ranch-0.8.1 + rm -rf ranch-0.9.0 $(MAKEDIRS): $(MAKE) -C $(@D) $(ACTION) diff --git a/deps/cowboy-0.9.0/AUTHORS b/deps/cowboy-0.10.0/AUTHORS similarity index 91% rename from deps/cowboy-0.9.0/AUTHORS rename to deps/cowboy-0.10.0/AUTHORS index d6678e91158..858a0d4d635 100644 --- a/deps/cowboy-0.9.0/AUTHORS +++ b/deps/cowboy-0.10.0/AUTHORS @@ -13,18 +13,22 @@ Vladimir Dronnikov YAMAMOTO Takashi Yurii Rashkovskii Andrew Majorov +Eduardo Gurgel Egobrain Josh Toft Steven Gravell Andrew Thompson Hunter Morris Ivan Lisenkov +Matthias Endler Seletskiy Stanislav +Sina Samavati Tristan Sloughter 0x00F6 0xAX Adam Cammmack Adrian Roe +Alexei Sholik Andre Graf Andrzej Sliwa Blake Gentry @@ -37,7 +41,9 @@ Dave Peticolas David Kelly DeadZen Dmitry Groshev -Eduardo Gurgel +Drew +Drew Varner +Eiichi Tsukata Hans Ulrich Niedermann Ivan Blinkov Jeremy Ong @@ -46,13 +52,14 @@ Josh Allmann Josh Marchán José Valim Julian Squires +Klaus Trainer Kuk-Hyun Lee Mathieu Lecarme -Matthias Endler Max Lapshin Michiel Hakvoort Ori Bar Pablo Vieytes +Peter Ericson RJ Radosław Szymczyszyn Richard Ramsden diff --git a/deps/cowboy-0.9.0/CHANGELOG.md b/deps/cowboy-0.10.0/CHANGELOG.md similarity index 90% rename from deps/cowboy-0.9.0/CHANGELOG.md rename to deps/cowboy-0.10.0/CHANGELOG.md index 2c25385a013..8041d1f792a 100644 --- a/deps/cowboy-0.9.0/CHANGELOG.md +++ b/deps/cowboy-0.10.0/CHANGELOG.md @@ -1,6 +1,88 @@ CHANGELOG ========= +0.10.0 +------ + + * Update Ranch to 0.10 and Cowlib to 0.6.2 + + * Update the body reading API to allow controlling rate of transfer + + The lack of this feature was causing various timeout issues + in some environments. + + The body/2 function now takes a Req and a list of options. The older + interface can still be used until Cowboy 1.0. + + The body_qs/2, part/2 and part_body/2 also accept this list of + options, and pass it down to the body/2 call. The default options + vary between the different functions. + + The return value of the function has changed. Older code should work + without modification but you should definitely still test it. + + All functions appropriately decode transfer and content encoding. + There is no need to have a special case for that anymore. + + The body/1,2 function supports streaming, with the same interface + as the part_body/1,2 function. + + * Deprecate the cowboy_req:init_stream, stream_body and skip_body functions + + They will be removed in Cowboy 1.0. + + * Add support for multipart + + The cowboy_req:part/1,2 and cowboy_req:part_body/1,2 can be + used for reading a multipart body. + + Documentation has been added. + + The old undocumented multipart functions were removed. + + * Allow the onresponse hook to override only status and headers + + Previously it wasn't possible to override them without also + overriding the body. The new return value is currently marked + as experimental. + + * Make loop handlers work with SPDY + + * Fix a race condition with loop handlers and keepalive requests + + * Fix parsing of accept-language header + + * Fix parsing of authorization header with empty passwords + + * Fix multiline headers handling + + * Various optimizations + + All code that is moved to cowlib is optimized at the same time + and benchmarks get added for all functions. + + The parsing of connection, content-length and transfer-encoding + has been optimized. + + Chunked transfer decoding has been optimized. + + * Enable +warn_missing_spec by default and fix specs + + * Remove the non-documented cowboy_client module; use gun instead + + * Numerous documentation updates and tweaks + + The guide now has a REST principles chapter and revised + and completed Websocket chapters, alongside a new multipart chapter. + + * Add a multipart file upload example + + * Test suites are being reworked and greatly improved + * Test Cowboy across all releases from R15B01 to 17.0, plus maint and master + * The Autobahn test suite is now always ran (as long as it's installed) + * Expected error reports are now silenced (but still logged) + * Applications are now only started once from a ct hook + 0.9.0 ----- diff --git a/deps/cowboy-0.9.0/CONTRIBUTING.md b/deps/cowboy-0.10.0/CONTRIBUTING.md similarity index 100% rename from deps/cowboy-0.9.0/CONTRIBUTING.md rename to deps/cowboy-0.10.0/CONTRIBUTING.md diff --git a/deps/cowlib-0.4.0/LICENSE b/deps/cowboy-0.10.0/LICENSE similarity index 92% rename from deps/cowlib-0.4.0/LICENSE rename to deps/cowboy-0.10.0/LICENSE index 3e227ee4c28..e7435f8dd85 100644 --- a/deps/cowlib-0.4.0/LICENSE +++ b/deps/cowboy-0.10.0/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2013, Loïc Hoguin +Copyright (c) 2011-2014, Loïc Hoguin Permission to use, copy, modify, and/or distribute this software for any purpose with or without fee is hereby granted, provided that the above diff --git a/deps/cowboy-0.9.0/Makefile b/deps/cowboy-0.10.0/Makefile similarity index 90% rename from deps/cowboy-0.9.0/Makefile rename to deps/cowboy-0.10.0/Makefile index de9490c97ac..e6c291488ff 100644 --- a/deps/cowboy-0.9.0/Makefile +++ b/deps/cowboy-0.10.0/Makefile @@ -1,16 +1,16 @@ PROJECT = cowboy ROOT = ../.. -REBAR = $(ROOT)/utils/rebar/rebar DIALYZER = dialyzer EBINS = $(shell find $(ROOT)/core -maxdepth 2 -name ebin -print) $(shell find $(ROOT)/deps -maxdepth 2 -name ebin -print) PA = $(foreach EBIN,$(EBINS),-pa $(EBIN)) -ERLC_OPTS = +debug_info +warn_export_all -I$(ROOT)/core -I$(ROOT)/deps $(PA) +ERLC_OPTS = +debug_info +warn_export_all -I$(ROOT)/deps $(PA) # +bin_opt_info DIRS = . \ - $(ROOT)/deps/ranch-0.8.1 + $(ROOT)/deps/ranch-0.10.0 \ + $(ROOT)/deps/cowlib-0.6.2 .PHONY: all compile clean diff --git a/deps/cowboy-0.9.0/README.md b/deps/cowboy-0.10.0/README.md similarity index 86% rename from deps/cowboy-0.9.0/README.md rename to deps/cowboy-0.10.0/README.md index 92f25630b01..8313bc6aad8 100644 --- a/deps/cowboy-0.9.0/README.md +++ b/deps/cowboy-0.10.0/README.md @@ -7,7 +7,7 @@ Goals ----- Cowboy aims to provide a **complete** HTTP stack in a **small** code base. -It is optimized for **low latency** and **low memory usage**, in parts +It is optimized for **low latency** and **low memory usage**, in part because it uses **binary strings**. Cowboy provides **routing** capabilities, selectively dispatching requests @@ -21,8 +21,11 @@ No parameterized module. No process dictionary. **Clean** Erlang code. Sponsors -------- -The SPDY protocol development is sponsored -by [LeoFS Cloud Storage](http://www.leofs.org). +The SPDY implementation was sponsored by +[LeoFS Cloud Storage](http://www.leofs.org). + +The project is currently sponsored by +[Kato.im](https://kato.im). Getting Started --------------- diff --git a/deps/cowboy-0.10.0/ROADMAP.md b/deps/cowboy-0.10.0/ROADMAP.md new file mode 100644 index 00000000000..452e6b954f3 --- /dev/null +++ b/deps/cowboy-0.10.0/ROADMAP.md @@ -0,0 +1,40 @@ +ROADMAP +======= + +This document explains in as much details as possible the +list of planned changes and work to be done on the Cowboy +server. It is intended to be exhaustive but some elements +might still be missing. + +1.0 (R16 and R17) +----------------- + +We are now in the final push to Cowboy 1.0. Further changes +are expected to be bug fixes and documentation improvements. + +2.0 (R17 and R18) +----------------- + + * HTTP/2.0 + + * Websocket permessage deflate compression + + * Better cowboy_req usability + + The number one usability concern with Cowboy today is + the need to keep the Req object. Most functions in + cowboy_req don't actually modify it and probably never + will. This change will make sure that only the required + function return a new Req. + + At the same time, some of the functions that cache their + results will stop to do so. This will save memory and + allow us to not modify the Req. + + * Start experimenting with maps. + +Under consideration +------------------- + + * Convenience API for extracting query string and body + information, similar to PHP's $_GET, $_POST and $_FILES diff --git a/deps/cowboy-0.10.0/all.sh b/deps/cowboy-0.10.0/all.sh new file mode 100755 index 00000000000..2216ed0df27 --- /dev/null +++ b/deps/cowboy-0.10.0/all.sh @@ -0,0 +1,19 @@ +#!/bin/sh + +KERL_INSTALL_PATH=~/erlang +KERL_RELEASES="r15b01 r15b02 r15b03 r16b r16b01 r16b02 r16b03-1 17.0 17.0_native" + +make build-tests + +for rel in $KERL_RELEASES +do + echo + echo " TESTING $rel" + echo + . $KERL_INSTALL_PATH/$rel/activate + cp ~/.kerl/builds/$rel/otp_src_*/lib/ssl/test/erl_make_certs.erl \ + deps/ct_helper/src/ + CT_OPTS="-label $rel" make tests +done + +xdg-open logs/all_runs.html diff --git a/deps/cowboy-0.10.0/deps/cowlib b/deps/cowboy-0.10.0/deps/cowlib new file mode 160000 index 00000000000..e2ffefe828b --- /dev/null +++ b/deps/cowboy-0.10.0/deps/cowlib @@ -0,0 +1 @@ +Subproject commit e2ffefe828b918486e2cd76e44c54ae9b62c616e diff --git a/deps/cowboy-0.10.0/deps/ranch b/deps/cowboy-0.10.0/deps/ranch new file mode 160000 index 00000000000..3189ef2d478 --- /dev/null +++ b/deps/cowboy-0.10.0/deps/ranch @@ -0,0 +1 @@ +Subproject commit 3189ef2d47843945efc96c224963380462c33d40 diff --git a/deps/cowboy-0.9.0/examples/README.md b/deps/cowboy-0.10.0/examples/README.md similarity index 94% rename from deps/cowboy-0.9.0/examples/README.md rename to deps/cowboy-0.10.0/examples/README.md index 0b1e67f984d..24af22830f9 100644 --- a/deps/cowboy-0.9.0/examples/README.md +++ b/deps/cowboy-0.10.0/examples/README.md @@ -46,7 +46,10 @@ Cowboy examples * [static_world](./static_world): static file handler - * [web_sever](./web_server): + * [upload](./upload): + multipart/form-data upload + + * [web_server](./web_server): serves files with lists directory entries * [websocket](./websocket): diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/Makefile b/deps/cowboy-0.10.0/examples/chunked_hello_world/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/Makefile rename to deps/cowboy-0.10.0/examples/chunked_hello_world/Makefile diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/README.md b/deps/cowboy-0.10.0/examples/chunked_hello_world/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/README.md rename to deps/cowboy-0.10.0/examples/chunked_hello_world/README.md diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/relx.config b/deps/cowboy-0.10.0/examples/chunked_hello_world/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/relx.config rename to deps/cowboy-0.10.0/examples/chunked_hello_world/relx.config diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world.app.src b/deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world.app.src rename to deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world.app.src diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world_app.erl b/deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world_app.erl rename to deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world_app.erl diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world_sup.erl b/deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/src/chunked_hello_world_sup.erl rename to deps/cowboy-0.10.0/examples/chunked_hello_world/src/chunked_hello_world_sup.erl diff --git a/deps/cowboy-0.9.0/examples/chunked_hello_world/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/chunked_hello_world/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/chunked_hello_world/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/chunked_hello_world/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/compress_response/Makefile b/deps/cowboy-0.10.0/examples/compress_response/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/Makefile rename to deps/cowboy-0.10.0/examples/compress_response/Makefile diff --git a/deps/cowboy-0.9.0/examples/compress_response/README.md b/deps/cowboy-0.10.0/examples/compress_response/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/README.md rename to deps/cowboy-0.10.0/examples/compress_response/README.md diff --git a/deps/cowboy-0.9.0/examples/compress_response/relx.config b/deps/cowboy-0.10.0/examples/compress_response/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/relx.config rename to deps/cowboy-0.10.0/examples/compress_response/relx.config diff --git a/deps/cowboy-0.9.0/examples/compress_response/src/compress_response.app.src b/deps/cowboy-0.10.0/examples/compress_response/src/compress_response.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/src/compress_response.app.src rename to deps/cowboy-0.10.0/examples/compress_response/src/compress_response.app.src diff --git a/deps/cowboy-0.9.0/examples/compress_response/src/compress_response_app.erl b/deps/cowboy-0.10.0/examples/compress_response/src/compress_response_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/src/compress_response_app.erl rename to deps/cowboy-0.10.0/examples/compress_response/src/compress_response_app.erl diff --git a/deps/cowboy-0.9.0/examples/compress_response/src/compress_response_sup.erl b/deps/cowboy-0.10.0/examples/compress_response/src/compress_response_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/src/compress_response_sup.erl rename to deps/cowboy-0.10.0/examples/compress_response/src/compress_response_sup.erl diff --git a/deps/cowboy-0.9.0/examples/compress_response/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/compress_response/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/compress_response/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/compress_response/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/cookie/Makefile b/deps/cowboy-0.10.0/examples/cookie/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/Makefile rename to deps/cowboy-0.10.0/examples/cookie/Makefile diff --git a/deps/cowboy-0.9.0/examples/cookie/README.md b/deps/cowboy-0.10.0/examples/cookie/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/README.md rename to deps/cowboy-0.10.0/examples/cookie/README.md diff --git a/deps/cowboy-0.9.0/examples/cookie/relx.config b/deps/cowboy-0.10.0/examples/cookie/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/relx.config rename to deps/cowboy-0.10.0/examples/cookie/relx.config diff --git a/deps/cowboy-0.9.0/examples/cookie/src/cookie.app.src b/deps/cowboy-0.10.0/examples/cookie/src/cookie.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/src/cookie.app.src rename to deps/cowboy-0.10.0/examples/cookie/src/cookie.app.src diff --git a/deps/cowboy-0.9.0/examples/cookie/src/cookie_app.erl b/deps/cowboy-0.10.0/examples/cookie/src/cookie_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/src/cookie_app.erl rename to deps/cowboy-0.10.0/examples/cookie/src/cookie_app.erl diff --git a/deps/cowboy-0.9.0/examples/cookie/src/cookie_sup.erl b/deps/cowboy-0.10.0/examples/cookie/src/cookie_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/src/cookie_sup.erl rename to deps/cowboy-0.10.0/examples/cookie/src/cookie_sup.erl diff --git a/deps/cowboy-0.9.0/examples/cookie/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/cookie/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/cookie/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/cookie/templates/toppage.dtl b/deps/cowboy-0.10.0/examples/cookie/templates/toppage.dtl similarity index 100% rename from deps/cowboy-0.9.0/examples/cookie/templates/toppage.dtl rename to deps/cowboy-0.10.0/examples/cookie/templates/toppage.dtl diff --git a/deps/cowboy-0.9.0/examples/echo_get/Makefile b/deps/cowboy-0.10.0/examples/echo_get/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/Makefile rename to deps/cowboy-0.10.0/examples/echo_get/Makefile diff --git a/deps/cowboy-0.9.0/examples/echo_get/README.md b/deps/cowboy-0.10.0/examples/echo_get/README.md similarity index 94% rename from deps/cowboy-0.9.0/examples/echo_get/README.md rename to deps/cowboy-0.10.0/examples/echo_get/README.md index d6622fc0ee8..07bf8337b8d 100644 --- a/deps/cowboy-0.9.0/examples/echo_get/README.md +++ b/deps/cowboy-0.10.0/examples/echo_get/README.md @@ -12,7 +12,7 @@ $ make To start the release in the foreground: ``` bash -$ ./_rel/bin/get_echo_example console +$ ./_rel/bin/echo_get_example console ``` Then point your browser at diff --git a/deps/cowboy-0.9.0/examples/echo_get/relx.config b/deps/cowboy-0.10.0/examples/echo_get/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/relx.config rename to deps/cowboy-0.10.0/examples/echo_get/relx.config diff --git a/deps/cowboy-0.9.0/examples/echo_get/src/echo_get.app.src b/deps/cowboy-0.10.0/examples/echo_get/src/echo_get.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/src/echo_get.app.src rename to deps/cowboy-0.10.0/examples/echo_get/src/echo_get.app.src diff --git a/deps/cowboy-0.9.0/examples/echo_get/src/echo_get_app.erl b/deps/cowboy-0.10.0/examples/echo_get/src/echo_get_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/src/echo_get_app.erl rename to deps/cowboy-0.10.0/examples/echo_get/src/echo_get_app.erl diff --git a/deps/cowboy-0.9.0/examples/echo_get/src/echo_get_sup.erl b/deps/cowboy-0.10.0/examples/echo_get/src/echo_get_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/src/echo_get_sup.erl rename to deps/cowboy-0.10.0/examples/echo_get/src/echo_get_sup.erl diff --git a/deps/cowboy-0.9.0/examples/echo_get/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/echo_get/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_get/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/echo_get/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/echo_post/Makefile b/deps/cowboy-0.10.0/examples/echo_post/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/Makefile rename to deps/cowboy-0.10.0/examples/echo_post/Makefile diff --git a/deps/cowboy-0.9.0/examples/echo_post/README.md b/deps/cowboy-0.10.0/examples/echo_post/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/README.md rename to deps/cowboy-0.10.0/examples/echo_post/README.md diff --git a/deps/cowboy-0.9.0/examples/echo_post/relx.config b/deps/cowboy-0.10.0/examples/echo_post/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/relx.config rename to deps/cowboy-0.10.0/examples/echo_post/relx.config diff --git a/deps/cowboy-0.9.0/examples/echo_post/src/echo_post.app.src b/deps/cowboy-0.10.0/examples/echo_post/src/echo_post.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/src/echo_post.app.src rename to deps/cowboy-0.10.0/examples/echo_post/src/echo_post.app.src diff --git a/deps/cowboy-0.9.0/examples/echo_post/src/echo_post_app.erl b/deps/cowboy-0.10.0/examples/echo_post/src/echo_post_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/src/echo_post_app.erl rename to deps/cowboy-0.10.0/examples/echo_post/src/echo_post_app.erl diff --git a/deps/cowboy-0.9.0/examples/echo_post/src/echo_post_sup.erl b/deps/cowboy-0.10.0/examples/echo_post/src/echo_post_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/src/echo_post_sup.erl rename to deps/cowboy-0.10.0/examples/echo_post/src/echo_post_sup.erl diff --git a/deps/cowboy-0.9.0/examples/echo_post/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/echo_post/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/echo_post/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/echo_post/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/error_hook/Makefile b/deps/cowboy-0.10.0/examples/error_hook/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/Makefile rename to deps/cowboy-0.10.0/examples/error_hook/Makefile diff --git a/deps/cowboy-0.9.0/examples/error_hook/README.md b/deps/cowboy-0.10.0/examples/error_hook/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/README.md rename to deps/cowboy-0.10.0/examples/error_hook/README.md diff --git a/deps/cowboy-0.9.0/examples/error_hook/relx.config b/deps/cowboy-0.10.0/examples/error_hook/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/relx.config rename to deps/cowboy-0.10.0/examples/error_hook/relx.config diff --git a/deps/cowboy-0.9.0/examples/error_hook/src/error_hook.app.src b/deps/cowboy-0.10.0/examples/error_hook/src/error_hook.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/src/error_hook.app.src rename to deps/cowboy-0.10.0/examples/error_hook/src/error_hook.app.src diff --git a/deps/cowboy-0.9.0/examples/error_hook/src/error_hook_app.erl b/deps/cowboy-0.10.0/examples/error_hook/src/error_hook_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/src/error_hook_app.erl rename to deps/cowboy-0.10.0/examples/error_hook/src/error_hook_app.erl diff --git a/deps/cowboy-0.9.0/examples/error_hook/src/error_hook_sup.erl b/deps/cowboy-0.10.0/examples/error_hook/src/error_hook_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/error_hook/src/error_hook_sup.erl rename to deps/cowboy-0.10.0/examples/error_hook/src/error_hook_sup.erl diff --git a/deps/cowboy-0.9.0/examples/eventsource/Makefile b/deps/cowboy-0.10.0/examples/eventsource/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/Makefile rename to deps/cowboy-0.10.0/examples/eventsource/Makefile diff --git a/deps/cowboy-0.9.0/examples/eventsource/README.md b/deps/cowboy-0.10.0/examples/eventsource/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/README.md rename to deps/cowboy-0.10.0/examples/eventsource/README.md diff --git a/deps/cowboy-0.9.0/examples/eventsource/priv/index.html b/deps/cowboy-0.10.0/examples/eventsource/priv/index.html similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/priv/index.html rename to deps/cowboy-0.10.0/examples/eventsource/priv/index.html diff --git a/deps/cowboy-0.9.0/examples/eventsource/relx.config b/deps/cowboy-0.10.0/examples/eventsource/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/relx.config rename to deps/cowboy-0.10.0/examples/eventsource/relx.config diff --git a/deps/cowboy-0.9.0/examples/eventsource/src/eventsource.app.src b/deps/cowboy-0.10.0/examples/eventsource/src/eventsource.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/src/eventsource.app.src rename to deps/cowboy-0.10.0/examples/eventsource/src/eventsource.app.src diff --git a/deps/cowboy-0.9.0/examples/eventsource/src/eventsource_app.erl b/deps/cowboy-0.10.0/examples/eventsource/src/eventsource_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/src/eventsource_app.erl rename to deps/cowboy-0.10.0/examples/eventsource/src/eventsource_app.erl diff --git a/deps/cowboy-0.9.0/examples/eventsource/src/eventsource_handler.erl b/deps/cowboy-0.10.0/examples/eventsource/src/eventsource_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/src/eventsource_handler.erl rename to deps/cowboy-0.10.0/examples/eventsource/src/eventsource_handler.erl diff --git a/deps/cowboy-0.9.0/examples/eventsource/src/eventsource_sup.erl b/deps/cowboy-0.10.0/examples/eventsource/src/eventsource_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/eventsource/src/eventsource_sup.erl rename to deps/cowboy-0.10.0/examples/eventsource/src/eventsource_sup.erl diff --git a/deps/cowboy-0.9.0/examples/hello_world/Makefile b/deps/cowboy-0.10.0/examples/hello_world/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/Makefile rename to deps/cowboy-0.10.0/examples/hello_world/Makefile diff --git a/deps/cowboy-0.9.0/examples/hello_world/README.md b/deps/cowboy-0.10.0/examples/hello_world/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/README.md rename to deps/cowboy-0.10.0/examples/hello_world/README.md diff --git a/deps/cowboy-0.9.0/examples/hello_world/relx.config b/deps/cowboy-0.10.0/examples/hello_world/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/relx.config rename to deps/cowboy-0.10.0/examples/hello_world/relx.config diff --git a/deps/cowboy-0.9.0/examples/hello_world/src/hello_world.app.src b/deps/cowboy-0.10.0/examples/hello_world/src/hello_world.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/src/hello_world.app.src rename to deps/cowboy-0.10.0/examples/hello_world/src/hello_world.app.src diff --git a/deps/cowboy-0.9.0/examples/hello_world/src/hello_world_app.erl b/deps/cowboy-0.10.0/examples/hello_world/src/hello_world_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/src/hello_world_app.erl rename to deps/cowboy-0.10.0/examples/hello_world/src/hello_world_app.erl diff --git a/deps/cowboy-0.9.0/examples/hello_world/src/hello_world_sup.erl b/deps/cowboy-0.10.0/examples/hello_world/src/hello_world_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/src/hello_world_sup.erl rename to deps/cowboy-0.10.0/examples/hello_world/src/hello_world_sup.erl diff --git a/deps/cowboy-0.9.0/examples/hello_world/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/hello_world/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/hello_world/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/hello_world/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/Makefile b/deps/cowboy-0.10.0/examples/markdown_middleware/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/Makefile rename to deps/cowboy-0.10.0/examples/markdown_middleware/Makefile diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/README.md b/deps/cowboy-0.10.0/examples/markdown_middleware/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/README.md rename to deps/cowboy-0.10.0/examples/markdown_middleware/README.md diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/priv/small.mp4 b/deps/cowboy-0.10.0/examples/markdown_middleware/priv/small.mp4 similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/priv/small.mp4 rename to deps/cowboy-0.10.0/examples/markdown_middleware/priv/small.mp4 diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/priv/small.ogv b/deps/cowboy-0.10.0/examples/markdown_middleware/priv/small.ogv similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/priv/small.ogv rename to deps/cowboy-0.10.0/examples/markdown_middleware/priv/small.ogv diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/priv/video.md b/deps/cowboy-0.10.0/examples/markdown_middleware/priv/video.md similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/priv/video.md rename to deps/cowboy-0.10.0/examples/markdown_middleware/priv/video.md diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/relx.config b/deps/cowboy-0.10.0/examples/markdown_middleware/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/relx.config rename to deps/cowboy-0.10.0/examples/markdown_middleware/relx.config diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/src/erlmarkdown.erl b/deps/cowboy-0.10.0/examples/markdown_middleware/src/erlmarkdown.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/src/erlmarkdown.erl rename to deps/cowboy-0.10.0/examples/markdown_middleware/src/erlmarkdown.erl diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_converter.erl b/deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_converter.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_converter.erl rename to deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_converter.erl diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware.app.src b/deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware.app.src rename to deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware.app.src diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware_app.erl b/deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware_app.erl rename to deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware_app.erl diff --git a/deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware_sup.erl b/deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/markdown_middleware/src/markdown_middleware_sup.erl rename to deps/cowboy-0.10.0/examples/markdown_middleware/src/markdown_middleware_sup.erl diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/Makefile b/deps/cowboy-0.10.0/examples/rest_basic_auth/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/Makefile rename to deps/cowboy-0.10.0/examples/rest_basic_auth/Makefile diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/README.md b/deps/cowboy-0.10.0/examples/rest_basic_auth/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/README.md rename to deps/cowboy-0.10.0/examples/rest_basic_auth/README.md diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/relx.config b/deps/cowboy-0.10.0/examples/rest_basic_auth/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/relx.config rename to deps/cowboy-0.10.0/examples/rest_basic_auth/relx.config diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth.app.src b/deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth.app.src rename to deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth.app.src diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth_app.erl b/deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth_app.erl rename to deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth_app.erl diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth_sup.erl b/deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/src/rest_basic_auth_sup.erl rename to deps/cowboy-0.10.0/examples/rest_basic_auth/src/rest_basic_auth_sup.erl diff --git a/deps/cowboy-0.9.0/examples/rest_basic_auth/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/rest_basic_auth/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_basic_auth/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/rest_basic_auth/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/Makefile b/deps/cowboy-0.10.0/examples/rest_hello_world/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/Makefile rename to deps/cowboy-0.10.0/examples/rest_hello_world/Makefile diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/README.md b/deps/cowboy-0.10.0/examples/rest_hello_world/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/README.md rename to deps/cowboy-0.10.0/examples/rest_hello_world/README.md diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/relx.config b/deps/cowboy-0.10.0/examples/rest_hello_world/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/relx.config rename to deps/cowboy-0.10.0/examples/rest_hello_world/relx.config diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world.app.src b/deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world.app.src rename to deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world.app.src diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world_app.erl b/deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world_app.erl rename to deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world_app.erl diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world_sup.erl b/deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/src/rest_hello_world_sup.erl rename to deps/cowboy-0.10.0/examples/rest_hello_world/src/rest_hello_world_sup.erl diff --git a/deps/cowboy-0.9.0/examples/rest_hello_world/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/rest_hello_world/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_hello_world/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/rest_hello_world/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/Makefile b/deps/cowboy-0.10.0/examples/rest_pastebin/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/Makefile rename to deps/cowboy-0.10.0/examples/rest_pastebin/Makefile diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/README.md b/deps/cowboy-0.10.0/examples/rest_pastebin/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/README.md rename to deps/cowboy-0.10.0/examples/rest_pastebin/README.md diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/priv/index.html b/deps/cowboy-0.10.0/examples/rest_pastebin/priv/index.html similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/priv/index.html rename to deps/cowboy-0.10.0/examples/rest_pastebin/priv/index.html diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/priv/index.txt b/deps/cowboy-0.10.0/examples/rest_pastebin/priv/index.txt similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/priv/index.txt rename to deps/cowboy-0.10.0/examples/rest_pastebin/priv/index.txt diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/relx.config b/deps/cowboy-0.10.0/examples/rest_pastebin/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/relx.config rename to deps/cowboy-0.10.0/examples/rest_pastebin/relx.config diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin.app.src b/deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin.app.src rename to deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin.app.src diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin_app.erl b/deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin_app.erl rename to deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin_app.erl diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin_sup.erl b/deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/src/rest_pastebin_sup.erl rename to deps/cowboy-0.10.0/examples/rest_pastebin/src/rest_pastebin_sup.erl diff --git a/deps/cowboy-0.9.0/examples/rest_pastebin/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/rest_pastebin/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_pastebin/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/rest_pastebin/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/Makefile b/deps/cowboy-0.10.0/examples/rest_stream_response/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/Makefile rename to deps/cowboy-0.10.0/examples/rest_stream_response/Makefile diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/README.md b/deps/cowboy-0.10.0/examples/rest_stream_response/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/README.md rename to deps/cowboy-0.10.0/examples/rest_stream_response/README.md diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/relx.config b/deps/cowboy-0.10.0/examples/rest_stream_response/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/relx.config rename to deps/cowboy-0.10.0/examples/rest_stream_response/relx.config diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response.app.src b/deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response.app.src rename to deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response.app.src diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response_app.erl b/deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response_app.erl rename to deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response_app.erl diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response_sup.erl b/deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/src/rest_stream_response_sup.erl rename to deps/cowboy-0.10.0/examples/rest_stream_response/src/rest_stream_response_sup.erl diff --git a/deps/cowboy-0.9.0/examples/rest_stream_response/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/rest_stream_response/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/rest_stream_response/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/rest_stream_response/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/Makefile b/deps/cowboy-0.10.0/examples/ssl_hello_world/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/Makefile rename to deps/cowboy-0.10.0/examples/ssl_hello_world/Makefile diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/README.md b/deps/cowboy-0.10.0/examples/ssl_hello_world/README.md similarity index 89% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/README.md rename to deps/cowboy-0.10.0/examples/ssl_hello_world/README.md index 4de78e7d8c6..faffb54083c 100644 --- a/deps/cowboy-0.9.0/examples/ssl_hello_world/README.md +++ b/deps/cowboy-0.10.0/examples/ssl_hello_world/README.md @@ -15,7 +15,7 @@ To start the release in the foreground: $ ./_rel/bin/ssl_hello_world_example console ``` -Then point your browser at [http://localhost:8443](http://localhost:8443). +Then point your browser at [https://localhost:8443](https://localhost:8443). You will need to temporarily trust the root certificate authority, which can also be found in `priv/ssl/cowboy-ca.crt`. diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/cowboy-ca.crt b/deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/cowboy-ca.crt similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/cowboy-ca.crt rename to deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/cowboy-ca.crt diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/server.crt b/deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/server.crt similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/server.crt rename to deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/server.crt diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/server.key b/deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/server.key similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/priv/ssl/server.key rename to deps/cowboy-0.10.0/examples/ssl_hello_world/priv/ssl/server.key diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/relx.config b/deps/cowboy-0.10.0/examples/ssl_hello_world/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/relx.config rename to deps/cowboy-0.10.0/examples/ssl_hello_world/relx.config diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world.app.src b/deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world.app.src rename to deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world.app.src diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world_app.erl b/deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world_app.erl rename to deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world_app.erl diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world_sup.erl b/deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/src/ssl_hello_world_sup.erl rename to deps/cowboy-0.10.0/examples/ssl_hello_world/src/ssl_hello_world_sup.erl diff --git a/deps/cowboy-0.9.0/examples/ssl_hello_world/src/toppage_handler.erl b/deps/cowboy-0.10.0/examples/ssl_hello_world/src/toppage_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/ssl_hello_world/src/toppage_handler.erl rename to deps/cowboy-0.10.0/examples/ssl_hello_world/src/toppage_handler.erl diff --git a/deps/cowboy-0.9.0/examples/static_world/Makefile b/deps/cowboy-0.10.0/examples/static_world/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/Makefile rename to deps/cowboy-0.10.0/examples/static_world/Makefile diff --git a/deps/cowboy-0.9.0/examples/static_world/README.md b/deps/cowboy-0.10.0/examples/static_world/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/README.md rename to deps/cowboy-0.10.0/examples/static_world/README.md diff --git a/deps/cowboy-0.9.0/examples/static_world/priv/small.mp4 b/deps/cowboy-0.10.0/examples/static_world/priv/small.mp4 similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/priv/small.mp4 rename to deps/cowboy-0.10.0/examples/static_world/priv/small.mp4 diff --git a/deps/cowboy-0.9.0/examples/static_world/priv/small.ogv b/deps/cowboy-0.10.0/examples/static_world/priv/small.ogv similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/priv/small.ogv rename to deps/cowboy-0.10.0/examples/static_world/priv/small.ogv diff --git a/deps/cowboy-0.9.0/examples/static_world/priv/test.txt b/deps/cowboy-0.10.0/examples/static_world/priv/test.txt similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/priv/test.txt rename to deps/cowboy-0.10.0/examples/static_world/priv/test.txt diff --git a/deps/cowboy-0.9.0/examples/static_world/priv/video.html b/deps/cowboy-0.10.0/examples/static_world/priv/video.html similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/priv/video.html rename to deps/cowboy-0.10.0/examples/static_world/priv/video.html diff --git a/deps/cowboy-0.9.0/examples/static_world/relx.config b/deps/cowboy-0.10.0/examples/static_world/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/relx.config rename to deps/cowboy-0.10.0/examples/static_world/relx.config diff --git a/deps/cowboy-0.9.0/examples/static_world/src/static_world.app.src b/deps/cowboy-0.10.0/examples/static_world/src/static_world.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/src/static_world.app.src rename to deps/cowboy-0.10.0/examples/static_world/src/static_world.app.src diff --git a/deps/cowboy-0.9.0/examples/static_world/src/static_world_app.erl b/deps/cowboy-0.10.0/examples/static_world/src/static_world_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/src/static_world_app.erl rename to deps/cowboy-0.10.0/examples/static_world/src/static_world_app.erl diff --git a/deps/cowboy-0.9.0/examples/static_world/src/static_world_sup.erl b/deps/cowboy-0.10.0/examples/static_world/src/static_world_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/static_world/src/static_world_sup.erl rename to deps/cowboy-0.10.0/examples/static_world/src/static_world_sup.erl diff --git a/deps/cowboy-0.10.0/examples/upload/Makefile b/deps/cowboy-0.10.0/examples/upload/Makefile new file mode 100644 index 00000000000..5f65387cefe --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/Makefile @@ -0,0 +1,6 @@ +PROJECT = upload + +DEPS = cowboy +dep_cowboy = pkg://cowboy master + +include ../../erlang.mk diff --git a/deps/cowboy-0.10.0/examples/upload/README.md b/deps/cowboy-0.10.0/examples/upload/README.md new file mode 100644 index 00000000000..db5a49ab95a --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/README.md @@ -0,0 +1,20 @@ +Multipart upload example +======================== + +To try this example, you need GNU `make` and `git` in your PATH. + +To build the example, run the following command: + +``` bash +$ make +``` + +To start the release in the foreground: + +``` bash +$ ./_rel/bin/upload_example console +``` + +Then point your browser at [http://localhost:8080](http://localhost:8080). + +The uploaded file will be displayed in the shell directly. diff --git a/deps/cowboy-0.10.0/examples/upload/priv/index.html b/deps/cowboy-0.10.0/examples/upload/priv/index.html new file mode 100644 index 00000000000..031420df490 --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/priv/index.html @@ -0,0 +1,13 @@ + + + + Multipart upload example + + + +
+ + +
+ + diff --git a/deps/cowboy-0.10.0/examples/upload/relx.config b/deps/cowboy-0.10.0/examples/upload/relx.config new file mode 100644 index 00000000000..e51e5c2a0f1 --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/relx.config @@ -0,0 +1,2 @@ +{release, {upload_example, "1"}, [upload]}. +{extended_start_script, true}. diff --git a/deps/cowboy-0.10.0/examples/upload/src/upload.app.src b/deps/cowboy-0.10.0/examples/upload/src/upload.app.src new file mode 100644 index 00000000000..232593552d6 --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/src/upload.app.src @@ -0,0 +1,15 @@ +%% Feel free to use, reuse and abuse the code in this file. + +{application, upload, [ + {description, "Cowboy multipart upload example."}, + {vsn, "1"}, + {modules, []}, + {registered, [upload_sup]}, + {applications, [ + kernel, + stdlib, + cowboy + ]}, + {mod, {upload_app, []}}, + {env, []} +]}. diff --git a/deps/cowboy-0.10.0/examples/upload/src/upload_app.erl b/deps/cowboy-0.10.0/examples/upload/src/upload_app.erl new file mode 100644 index 00000000000..5285c0f6107 --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/src/upload_app.erl @@ -0,0 +1,25 @@ +%% Feel free to use, reuse and abuse the code in this file. + +%% @private +-module(upload_app). +-behaviour(application). + +%% API. +-export([start/2]). +-export([stop/1]). + +%% API. +start(_Type, _Args) -> + Dispatch = cowboy_router:compile([ + {'_', [ + {"/", cowboy_static, {priv_file, upload, "index.html"}}, + {"/upload", upload_handler, []}, + {"/files/[...]", cowboy_static, {priv_dir, upload, "files"}} + ]} + ]), + {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], + [{env, [{dispatch, Dispatch}]}]), + upload_sup:start_link(). + +stop(_State) -> + ok. diff --git a/deps/cowboy-0.10.0/examples/upload/src/upload_handler.erl b/deps/cowboy-0.10.0/examples/upload/src/upload_handler.erl new file mode 100644 index 00000000000..0895d784af5 --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/src/upload_handler.erl @@ -0,0 +1,21 @@ +-module(upload_handler). +-behaviour(cowboy_http_handler). + +-export([init/3]). +-export([handle/2]). +-export([terminate/3]). + +init(_, Req, _Opts) -> + {ok, Req, undefined}. + +handle(Req, State) -> + {ok, Headers, Req2} = cowboy_req:part(Req), + {ok, Data, Req3} = cowboy_req:part_body(Req2), + {file, <<"inputfile">>, Filename, ContentType, _TE} + = cow_multipart:form_data(Headers), + io:format("Received file ~p of content-type ~p as follow:~n~p~n~n", + [Filename, ContentType, Data]), + {ok, Req3, State}. + +terminate(_Reason, _Req, _State) -> + ok. diff --git a/deps/cowboy-0.10.0/examples/upload/src/upload_sup.erl b/deps/cowboy-0.10.0/examples/upload/src/upload_sup.erl new file mode 100644 index 00000000000..0d0350322ca --- /dev/null +++ b/deps/cowboy-0.10.0/examples/upload/src/upload_sup.erl @@ -0,0 +1,23 @@ +%% Feel free to use, reuse and abuse the code in this file. + +%% @private +-module(upload_sup). +-behaviour(supervisor). + +%% API. +-export([start_link/0]). + +%% supervisor. +-export([init/1]). + +%% API. + +-spec start_link() -> {ok, pid()}. +start_link() -> + supervisor:start_link({local, ?MODULE}, ?MODULE, []). + +%% supervisor. + +init([]) -> + Procs = [], + {ok, {{one_for_one, 10, 10}, Procs}}. diff --git a/deps/cowboy-0.9.0/examples/web_server/Makefile b/deps/cowboy-0.10.0/examples/web_server/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/Makefile rename to deps/cowboy-0.10.0/examples/web_server/Makefile diff --git a/deps/cowboy-0.9.0/examples/web_server/README.md b/deps/cowboy-0.10.0/examples/web_server/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/README.md rename to deps/cowboy-0.10.0/examples/web_server/README.md diff --git a/deps/cowboy-0.9.0/examples/web_server/priv/small.mp4 b/deps/cowboy-0.10.0/examples/web_server/priv/small.mp4 similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/priv/small.mp4 rename to deps/cowboy-0.10.0/examples/web_server/priv/small.mp4 diff --git a/deps/cowboy-0.9.0/examples/web_server/priv/small.ogv b/deps/cowboy-0.10.0/examples/web_server/priv/small.ogv similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/priv/small.ogv rename to deps/cowboy-0.10.0/examples/web_server/priv/small.ogv diff --git a/deps/cowboy-0.9.0/examples/web_server/priv/test.txt b/deps/cowboy-0.10.0/examples/web_server/priv/test.txt similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/priv/test.txt rename to deps/cowboy-0.10.0/examples/web_server/priv/test.txt diff --git a/deps/cowboy-0.9.0/examples/web_server/priv/video.html b/deps/cowboy-0.10.0/examples/web_server/priv/video.html similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/priv/video.html rename to deps/cowboy-0.10.0/examples/web_server/priv/video.html diff --git a/deps/cowboy-0.9.0/examples/web_server/relx.config b/deps/cowboy-0.10.0/examples/web_server/relx.config similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/relx.config rename to deps/cowboy-0.10.0/examples/web_server/relx.config diff --git a/deps/cowboy-0.9.0/examples/web_server/src/directory_handler.erl b/deps/cowboy-0.10.0/examples/web_server/src/directory_handler.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/src/directory_handler.erl rename to deps/cowboy-0.10.0/examples/web_server/src/directory_handler.erl diff --git a/deps/cowboy-0.9.0/examples/web_server/src/directory_lister.erl b/deps/cowboy-0.10.0/examples/web_server/src/directory_lister.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/src/directory_lister.erl rename to deps/cowboy-0.10.0/examples/web_server/src/directory_lister.erl diff --git a/deps/cowboy-0.9.0/examples/web_server/src/web_server.app.src b/deps/cowboy-0.10.0/examples/web_server/src/web_server.app.src similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/src/web_server.app.src rename to deps/cowboy-0.10.0/examples/web_server/src/web_server.app.src diff --git a/deps/cowboy-0.9.0/examples/web_server/src/web_server_app.erl b/deps/cowboy-0.10.0/examples/web_server/src/web_server_app.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/src/web_server_app.erl rename to deps/cowboy-0.10.0/examples/web_server/src/web_server_app.erl diff --git a/deps/cowboy-0.9.0/examples/web_server/src/web_server_sup.erl b/deps/cowboy-0.10.0/examples/web_server/src/web_server_sup.erl similarity index 100% rename from deps/cowboy-0.9.0/examples/web_server/src/web_server_sup.erl rename to deps/cowboy-0.10.0/examples/web_server/src/web_server_sup.erl diff --git a/deps/cowboy-0.9.0/examples/websocket/Makefile b/deps/cowboy-0.10.0/examples/websocket/Makefile similarity index 100% rename from deps/cowboy-0.9.0/examples/websocket/Makefile rename to deps/cowboy-0.10.0/examples/websocket/Makefile diff --git a/deps/cowboy-0.9.0/examples/websocket/README.md b/deps/cowboy-0.10.0/examples/websocket/README.md similarity index 100% rename from deps/cowboy-0.9.0/examples/websocket/README.md rename to deps/cowboy-0.10.0/examples/websocket/README.md diff --git a/deps/cowboy-0.9.0/examples/websocket/priv/index.html b/deps/cowboy-0.10.0/examples/websocket/priv/index.html similarity index 96% rename from deps/cowboy-0.9.0/examples/websocket/priv/index.html rename to deps/cowboy-0.10.0/examples/websocket/priv/index.html index 5bc7f1565d3..56f36b248ce 100644 --- a/deps/cowboy-0.9.0/examples/websocket/priv/index.html +++ b/deps/cowboy-0.10.0/examples/websocket/priv/index.html @@ -9,6 +9,7 @@ $(document).ready(init); function init() { + $('#server').val("ws://" + window.location.host + "/websocket"); if(!("WebSocket" in window)){ $('#status').append('

websockets are not supported

'); $("#navigation").hide(); @@ -92,7 +93,7 @@

Websocket client