diff --git a/examples/file_server/priv/中文/中文.html b/examples/file_server/priv/中文/中文.html
new file mode 100644
index 00000000..43ca75f5
--- /dev/null
+++ b/examples/file_server/priv/中文/中文.html
@@ -0,0 +1,8 @@
+
+
+
+
+
+ 中文！
+
+
diff --git a/examples/file_server/src/directory_h.erl b/examples/file_server/src/directory_h.erl
index 66e1466b..7d7bd9ad 100644
--- a/examples/file_server/src/directory_h.erl
+++ b/examples/file_server/src/directory_h.erl
@@ -8,6 +8,7 @@
-export([allowed_methods/2]).
-export([resource_exists/2]).
-export([content_types_provided/2]).
+-export([charsets_provided/2]).
%% Callback Callbacks
-export([list_json/2]).
@@ -31,12 +32,15 @@ content_types_provided(Req, State) ->
{{<<"application">>, <<"json">>, []}, list_json}
], Req, State}.
+charsets_provided(Req, State) ->
+ {[<<"utf-8">>], Req, State}.
+
list_json(Req, {Path, Fs}) ->
- Files = [ <<(list_to_binary(F))/binary>> || F <- Fs ],
+ Files = [unicode:characters_to_binary(F) || F <- Fs],
{jsx:encode(Files), Req, Path}.
list_html(Req, {Path, Fs}) ->
- Body = [[ links(Path, F) || F <- [".."|Fs] ]],
+ Body = [[links(Path, unicode:characters_to_binary(F)) || F <- [".."|Fs]]],
HTML = [<<"Index",
"">>, Body, <<"\n">>],
{HTML, Req, Path}.
diff --git a/examples/file_server/src/file_server_app.erl b/examples/file_server/src/file_server_app.erl
index 17e73b29..0ba8f6c3 100644
--- a/examples/file_server/src/file_server_app.erl
+++ b/examples/file_server/src/file_server_app.erl
@@ -15,7 +15,8 @@ start(_Type, _Args) ->
{'_', [
{"/[...]", cowboy_static, {priv_dir, file_server, "", [
{mimetypes, cow_mimetypes, all},
- {dir_handler, directory_h}
+ {dir_handler, directory_h},
+ {charset, <<"utf-8">>}
]}}
]}
]),
diff --git a/test/examples_SUITE.erl b/test/examples_SUITE.erl
index ed90c2bf..1e88f2f2 100644
--- a/test/examples_SUITE.erl
+++ b/test/examples_SUITE.erl
@@ -372,13 +372,16 @@ file_server(Config) ->
do_file_server(Transport, Protocol, Config) ->
%% Directory.
{200, DirHeaders, <<"", _/bits >>} = do_get(Transport, Protocol, "/", Config),
- {_, <<"text/html">>} = lists:keyfind(<<"content-type">>, 1, DirHeaders),
+ {_, <<"text/html; charset=utf-8">>} = lists:keyfind(<<"content-type">>, 1, DirHeaders),
_ = do_rest_get(Transport, Protocol, "/", <<"application/json">>, undefined, Config),
%% Files.
{200, _, _} = do_get(Transport, Protocol, "/small.mp4", Config),
{200, _, _} = do_get(Transport, Protocol, "/small.ogv", Config),
{200, _, _} = do_get(Transport, Protocol, "/test.txt", Config),
{200, _, _} = do_get(Transport, Protocol, "/video.html", Config),
+ {200, _, _} = do_get(Transport, Protocol,
+ ["/", cow_uri:urlencode(<<"中文"/utf8>>), "/", cow_uri:urlencode(<<"中文.html"/utf8>>)],
+ Config),
ok.
%% Markdown middleware.