X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=920fe0e6e84cde964671d08ad53b215ada9a8146;hb=6484fba0d3daff654c5f419bc91b6bf6229e188f;hp=22309080dd0066a22271ec02307a59dc491256a4;hpb=4d98d16dff4df87a96054967d73cf3c7a4801344;p=catagits%2FCatalyst-Runtime.git
diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm
index 2230908..920fe0e 100644
--- a/lib/Catalyst/Engine.pm
+++ b/lib/Catalyst/Engine.pm
@@ -47,7 +47,7 @@ sub finalize_body {
if ( ref $c->response->body && $c->response->body->can('read') ) {
while ( !$c->response->body->eof() ) {
$c->response->body->read( my $buffer, $CHUNKSIZE );
- $self->write( $c, $buffer );
+ last unless $self->write( $c, $buffer );
}
$c->response->body->close();
}
@@ -90,7 +90,7 @@ sub finalize_cookies {
sub finalize_error {
my ( $self, $c ) = @_;
- $c->res->headers->content_type('text/html');
+ $c->res->content_type('text/html; charset=utf-8');
my $name = $c->config->{name} || 'Catalyst Application';
my ( $title, $error, $infos );
@@ -99,10 +99,11 @@ sub finalize_error {
# For pretty dumps
local $Data::Dumper::Terse = 1;
$error = join '',
- map { '' . encode_entities($_) . '' }
+ map { '' . encode_entities($_) . '
' }
@{ $c->error };
$error ||= 'No output';
$title = $name = "$name on Catalyst $Catalyst::VERSION";
+ $name = "$name
";
# Don't show context in the dump
delete $c->req->{_context};
@@ -124,12 +125,7 @@ sub finalize_error {
my $name = $dump->[0];
my $value = encode_entities( Dumper $dump->[1] );
push @infos, sprintf <<"EOF", $name, $value;
-
-
+
@@ -156,17 +152,22 @@ EOF
$name = '';
}
$c->res->body( <<"" );
-
+
+
+
+
$title
-