From 69c01de9d29ad4ce0b99c8c50be4d2eb82c22069 Mon Sep 17 00:00:00 2001 From: Marius Gavrilescu Date: Mon, 23 Feb 2015 19:43:34 +0200 Subject: [PATCH] Declare charset in content-type header --- lib/Plack/App/Gruntmaster.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/Plack/App/Gruntmaster.pm b/lib/Plack/App/Gruntmaster.pm index edf1911..3ec5284 100644 --- a/lib/Plack/App/Gruntmaster.pm +++ b/lib/Plack/App/Gruntmaster.pm @@ -75,7 +75,7 @@ sub job { db->job ($_{job}) } sub user { db->user ($_{user}) } sub redirect { [301, ['X-Forever' => 1, 'Location' => $_[0]], []] } -sub reply { [200, ['Content-Type' => 'text/plain'], \@_] } +sub reply { [200, ['Content-Type' => 'text/plain; charset=utf-8'], \@_] } sub response { my ($template, $title, $params, $maxage) = @_; unless ($params) { @@ -104,14 +104,14 @@ sub dispatch_request{ return NOT_FOUND unless -e "css/themes/$theme.css"; my $css = read_file "css/themes/$theme.css"; $css .= read_file $_ for ; - my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css'); + my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'text/css; charset=utf-8'); [200, \@headers, [development ? $css : CSS::Minifier::XS::minify $css]] }, sub (/js.js) { my $js; $js .= read_file $_ for ; - my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript'); + my @headers = ('X-Forever' => 1, 'Cache-Control' => 'public, max-age=604800', 'Content-Type' => 'application/javascript; charset=utf-8'); [200, \@headers, [development ? $js : JavaScript::Minifier::XS::minify $js]] }, @@ -148,9 +148,9 @@ sub dispatch_request{ return $r if ref $r ne 'Plack::App::Gruntmaster::Response'; my @hdrs = ('X-Forever' => 1, 'Cache-Control' => "$privacy, max-age=$r->{maxage}"); push @hdrs, Vary => 'Authorization' if $privacy eq 'private'; - return [200, ['Content-Type' => 'application/json', @hdrs], [encode_json $r->{params}]] if $format eq 'json'; + return [200, ['Content-Type' => 'application/json; charset=utf-8', @hdrs], [encode_json $r->{params}]] if $format eq 'json'; my $ret = render $r->{template}, 'en', title => $r->{title}, %{$r->{params}}; - [200, ['Content-Type' => 'text/html', @hdrs], [encode 'UTF-8', $ret]] + [200, ['Content-Type' => 'text/html; charset=utf-8', @hdrs], [encode 'UTF-8', $ret]] }, }, @@ -213,7 +213,7 @@ sub dispatch_request{ sub (/) { redispatch_to '/index' }, sub (/favicon.ico) { redirect '/static/favicon.ico' }, - sub (/:article) { [200, ['Content-Type' => 'text/html', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] } + sub (/:article) { [200, ['Content-Type' => 'text/html; charset=utf-8', 'Cache-Control' => 'public, max-age=60', 'X-Forever' => 1], [render_article $_{article}, 'en']] } }, sub (POST) { -- 2.39.2