aboutsummaryrefslogtreecommitdiffstats
path: root/examples/websocket/src
diff options
context:
space:
mode:
authorLoïc Hoguin <[email protected]>2013-02-09 15:38:35 +0100
committerLoïc Hoguin <[email protected]>2013-02-09 15:38:35 +0100
commit574c3d490061fa4f8ddd3eb5c855abf5eab7b458 (patch)
treef72ee79ed20f1fe5cd8c39c2d739d97ba19e00a6 /examples/websocket/src
parentefbd9133261e1aabf473f2f6f5ab4cbb36062481 (diff)
downloadcowboy-574c3d490061fa4f8ddd3eb5c855abf5eab7b458.tar.gz
cowboy-574c3d490061fa4f8ddd3eb5c855abf5eab7b458.tar.bz2
cowboy-574c3d490061fa4f8ddd3eb5c855abf5eab7b458.zip
Improve Websocket example
Diffstat (limited to 'examples/websocket/src')
-rw-r--r--examples/websocket/src/toppage_handler.erl4
-rw-r--r--examples/websocket/src/websocket_app.erl6
2 files changed, 8 insertions, 2 deletions
diff --git a/examples/websocket/src/toppage_handler.erl b/examples/websocket/src/toppage_handler.erl
index 63099b0..b315a19 100644
--- a/examples/websocket/src/toppage_handler.erl
+++ b/examples/websocket/src/toppage_handler.erl
@@ -11,7 +11,9 @@ init(_Transport, Req, []) ->
handle(Req, State) ->
Html = get_html(),
- {ok, Req2} = cowboy_req:reply(200, [], Html, Req),
+ {ok, Req2} = cowboy_req:reply(200,
+ [{<<"content-type">>, <<"text/html">>}],
+ Html, Req),
{ok, Req2, State}.
terminate(_Reason, _Req, _State) ->
diff --git a/examples/websocket/src/websocket_app.erl b/examples/websocket/src/websocket_app.erl
index 93598d0..049c524 100644
--- a/examples/websocket/src/websocket_app.erl
+++ b/examples/websocket/src/websocket_app.erl
@@ -13,7 +13,11 @@ start(_Type, _Args) ->
Dispatch = cowboy_router:compile([
{'_', [
{"/", toppage_handler, []},
- {"/websocket", ws_handler, []}
+ {"/websocket", ws_handler, []},
+ {"/static/[...]", cowboy_static, [
+ {directory, {priv_dir, websocket, [<<"static">>]}},
+ {mimetypes, {fun mimetypes:path_to_mimes/2, default}}
+ ]}
]}
]),
{ok, _} = cowboy:start_http(http, 100, [{port, 8080}],