X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst.pm;h=641c84e31a884f278ca8d2966743456add05db0b;hb=d536010b1fe05ffe44ecf20d9ca0ac1445d1d2ed;hp=6621825f8a580b72cb43815977933db176ce8be9;hpb=3143ee5f686e48785bc13cf756a4dde97aae682e;p=catagits%2FCatalyst-Runtime.git diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 6621825..641c84e 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -84,7 +84,7 @@ __PACKAGE__->stats_class('Catalyst::Stats'); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90001'; +our $VERSION = '5.90002'; sub import { my ( $class, @arguments ) = @_; @@ -1866,6 +1866,7 @@ sub finalize_headers { $response->body( qq{

This item has moved here.

} ); + $response->content_type('text/html; charset=utf-8'); } } @@ -1976,7 +1977,7 @@ sub handle_request { return $status; } -=head2 $c->prepare( @arguments ) +=head2 $class->prepare( @arguments ) Creates a Catalyst context from an engine-specific request (Apache, CGI, etc.). @@ -2726,16 +2727,6 @@ sub apply_default_middlewares { }, ); - my $server_matches = sub { - my ($re) = @_; - return sub { - my ($env) = @_; - my $server = $env->{SERVER_SOFTWARE}; - return unless $server; - return $server =~ $re ? 1 : 0; - }; - }; - # If we're running under Lighttpd, swap PATH_INFO and SCRIPT_NAME # http://lists.scsys.co.uk/pipermail/catalyst/2006-June/008361.html $psgi_app = Plack::Middleware::LighttpdScriptNameFix->wrap($psgi_app);