diff options
Diffstat (limited to 'examples/web_server/src')
| -rw-r--r-- | examples/web_server/src/directory_lister.erl | 4 | ||||
| -rw-r--r-- | examples/web_server/src/web_server_app.erl | 14 |
2 files changed, 6 insertions, 12 deletions
diff --git a/examples/web_server/src/directory_lister.erl b/examples/web_server/src/directory_lister.erl index aa36314..79d5ea3 100644 --- a/examples/web_server/src/directory_lister.erl +++ b/examples/web_server/src/directory_lister.erl @@ -14,8 +14,8 @@ execute(Req, Env) -> redirect_directory(Req, Env) -> {Path, Req1} = cowboy_req:path_info(Req), Path1 = << <<S/binary, $/>> || S <- Path >>, - {handler_opts, StaticOpts} = lists:keyfind(handler_opts, 1, Env), - {dir_handler, DirHandler} = lists:keyfind(dir_handler, 1, StaticOpts), + {handler_opts, {_, _, _, Extra}} = lists:keyfind(handler_opts, 1, Env), + {dir_handler, DirHandler} = lists:keyfind(dir_handler, 1, Extra), FullPath = resource_path(Path1), case valid_path(Path) and filelib:is_dir(FullPath) of true -> handle_directory(Req1, Env, Path1, FullPath, DirHandler); diff --git a/examples/web_server/src/web_server_app.erl b/examples/web_server/src/web_server_app.erl index 988a8fb..e32d947 100644 --- a/examples/web_server/src/web_server_app.erl +++ b/examples/web_server/src/web_server_app.erl @@ -13,16 +13,10 @@ start(_Type, _Args) -> Dispatch = cowboy_router:compile([ {'_', [ - {"/[...]", cowboy_static, [ - {directory, {priv_dir, web_server, []}}, - {dir_handler, directory_handler}, - {mimetypes, [ - {<<".html">>, [<<"text/html">>]}, - {<<".txt">>, [<<"text/plain">>]}, - {<<".mp4">>, [<<"video/mp4">>]}, - {<<".ogv">>, [<<"video/ogg">>]} - ]} - ]} + {"/[...]", cowboy_static, {priv_dir, web_server, "", [ + {mimetypes, cow_mimetypes, all}, + {dir_handler, directory_handler} + ]}} ]} ]), {ok, _} = cowboy:start_http(http, 100, [{port, 8080}], [ |