Skip to content

Commit 1fc11e9

Browse files
bas0Nmergify[bot]
authored andcommitted
Use charsets_provided callback for charset negotiation
Replace manual header setting with charsets_provided/2 callback to let Cowboy handle charset negotiation automatically. (cherry picked from commit c1cc495)
1 parent a6c74ec commit 1fc11e9

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

deps/rabbitmq_tracing/src/rabbit_tracing_wm_file.erl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
-module(rabbit_tracing_wm_file).
88

99
-export([init/2, resource_exists/2, serve/2, content_types_provided/2,
10-
is_authorized/2, allowed_methods/2, delete_resource/2]).
10+
charsets_provided/2, is_authorized/2, allowed_methods/2, delete_resource/2]).
1111
-export([serve/1]).
1212

1313
-include_lib("rabbitmq_management_agent/include/rabbit_mgmt_records.hrl").
@@ -20,6 +20,9 @@ init(Req, _State) ->
2020
content_types_provided(ReqData, Context) ->
2121
{[{<<"text/plain">>, serve}], ReqData, Context}.
2222

23+
charsets_provided(ReqData, Context) ->
24+
{[<<"utf-8">>], ReqData, Context}.
25+
2326
allowed_methods(ReqData, Context) ->
2427
{[<<"HEAD">>, <<"GET">>, <<"DELETE">>], ReqData, Context}.
2528

@@ -34,10 +37,7 @@ serve(ReqData, Context) ->
3437
Content = rabbit_tracing_util:apply_on_node(ReqData, Context,
3538
rabbit_tracing_wm_file,
3639
serve, [Name]),
37-
ReqWithCharset = cowboy_req:set_resp_header(<<"content-type">>,
38-
<<"text/plain; charset=utf-8">>,
39-
ReqData),
40-
{Content, ReqWithCharset, Context}.
40+
{Content, ReqData, Context}.
4141

4242
serve(Name) ->
4343
Path = rabbit_tracing_files:full_path(Name),

0 commit comments

Comments
 (0)