diff options
| author | lin <lin@debian> | 2023-02-15 00:30:18 +0800 |
|---|---|---|
| committer | Loïc Hoguin <[email protected]> | 2023-12-07 15:31:11 +0100 |
| commit | 4f26d6a5730685d00ed1533fe33dc2eb3a51a4e8 (patch) | |
| tree | 23e6b8126f5fbd0e9e795ec7e3d15c2b7000cbca /examples/file_server | |
| parent | 32594a51994c70cfa1a82119a7d439af98c384b4 (diff) | |
| download | cowboy-4f26d6a5730685d00ed1533fe33dc2eb3a51a4e8.tar.gz cowboy-4f26d6a5730685d00ed1533fe33dc2eb3a51a4e8.tar.bz2 cowboy-4f26d6a5730685d00ed1533fe33dc2eb3a51a4e8.zip | |
Add UTF-8 support to example file_server
LH: I have fixed issues in the PR and incorporated changes
from a sister PR by @djankovic (git author: Dom J). I also
made sure the UTF-8 files were readable without Chinese
fonts and added their downloading to the examples test suite.
Diffstat (limited to 'examples/file_server')
| -rw-r--r-- | examples/file_server/priv/中文/中文.html | 8 | ||||
| -rw-r--r-- | examples/file_server/src/directory_h.erl | 8 | ||||
| -rw-r--r-- | examples/file_server/src/file_server_app.erl | 3 |
3 files changed, 16 insertions, 3 deletions
diff --git a/examples/file_server/priv/中文/中文.html b/examples/file_server/priv/中文/中文.html new file mode 100644 index 0000000..43ca75f --- /dev/null +++ b/examples/file_server/priv/中文/中文.html @@ -0,0 +1,8 @@ +<html> + <head> + <meta charset='utf-8'> + </head> + <body> + 中文！ + </body> +</html> diff --git a/examples/file_server/src/directory_h.erl b/examples/file_server/src/directory_h.erl index 66e1466..7d7bd9a 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 = [<<"<!DOCTYPE html><html><head><title>Index</title></head>", "<body>">>, Body, <<"</body></html>\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 17e73b2..0ba8f6c 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">>} ]}} ]} ]), |