X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=6e9d63cdaae2a2ba7395fbeb09d50447ee46227f;hp=5d0dcaa1ca19292cf2c2a67dc0d883a4ff74632a;hb=84755bc3c6c73deaa10f3f7ba4e1a0432220c9fc;hpb=d455230c403e68cf4a364f3e0ac50c1749353e8e diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 5d0dcaa..6e9d63c 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1863,9 +1863,17 @@ sub finalize_headers { if ( !$response->has_body ) { # Add a default body if none is already present - $response->body( - qq{

This item has moved here.

} - ); + $response->body(<<"EOF"); + + + + Moved + + +

This item has moved here.

+ + +EOF $response->content_type('text/html; charset=utf-8'); } } @@ -1977,7 +1985,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.). @@ -2727,16 +2735,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);