X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst%2FEngine.pm;h=963ac5ad7d6cfa8d71741f0497383441ee81d3bd;hp=b5cba7bc343d215c0b17eca0bba63de43b6654e7;hb=0ba80bce27a56d366c8d44c254332dd83f9ba0f9;hpb=e0616220ee0bf2a2a9f0bacc0cb3b7fd2a464f36 diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index b5cba7b..963ac5a 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -30,13 +30,11 @@ See L. =head1 METHODS -=over 4 - -=item $self->finalize_output +=head2 $self->finalize_output , see finalize_body -=item $self->finalize_body($c) +=head2 $self->finalize_body($c) Finalize body. Prints the response output. @@ -44,11 +42,19 @@ Finalize body. Prints the response output. sub finalize_body { my ( $self, $c ) = @_; - - $self->write( $c, $c->response->output ); + if ( ref $c->response->body && $c->response->body->can('read') ) { + while ( !$c->response->body->eof() ) { + $c->response->body->read( my $buffer, $CHUNKSIZE ); + last unless $self->write( $c, $buffer ); + } + $c->response->body->close(); + } + else { + $self->write( $c, $c->response->body ); + } } -=item $self->finalize_cookies($c) +=head2 $self->finalize_cookies($c) =cut @@ -70,19 +76,19 @@ sub finalize_cookies { push @cookies, $cookie->as_string; } - if (@cookies) { - $c->res->headers->push_header( 'Set-Cookie' => join ',', @cookies ); + for my $cookie (@cookies) { + $c->res->headers->push_header( 'Set-Cookie' => $cookie ); } } -=item $self->finalize_error($c) +=head2 $self->finalize_error($c) =cut 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 ); @@ -90,11 +96,15 @@ sub finalize_error { # For pretty dumps local $Data::Dumper::Terse = 1; - $error = join '', - map { '' . encode_entities($_) . '' } - @{ $c->error }; + $error = join '', map { + '

' + . encode_entities($_) + . '

' + } @{ $c->error }; $error ||= 'No output'; + $error = qq{
$error
}; $title = $name = "$name on Catalyst $Catalyst::VERSION"; + $name = "

$name

"; # Don't show context in the dump delete $c->req->{_context}; @@ -109,15 +119,21 @@ sub finalize_error { my $req = encode_entities Dumper $c->req; my $res = encode_entities Dumper $c->res; my $stash = encode_entities Dumper $c->stash; - $infos = <<""; -
-Request
-
$req
-Response
-
$res
-Stash
-
$stash
+ my @infos; + my $i = 0; + for my $dump ( $c->dump_these ) { + my $name = $dump->[0]; + my $value = encode_entities( Dumper $dump->[1] ); + push @infos, sprintf <<"EOF", $name, $value; +

%s

+
+ 
%s
+
+EOF + $i++; + } + $infos = join "\n", @infos; } else { $title = $name; @@ -126,20 +142,35 @@ sub finalize_error { 
 (en) Please come back later
 (de) Bitte versuchen sie es spaeter nocheinmal
-(nl) Gelieve te komen later terug
+(at) Konnten's bitt'schoen spaeter nochmal reinschauen
 (no) Vennligst prov igjen senere
-(fr) Veuillez revenir plus tard
-(es) Vuelto por favor mas adelante
-(pt) Voltado por favor mais tarde
-(it) Ritornato prego più successivamente
+(dk) Venligst prov igen senere
+(pl) Prosze sprobowac pozniej
$name = ''; } $c->res->body( <<"" ); - + + + + $title + @@ -196,15 +253,21 @@ sub finalize_error { + + # Trick IE + $c->res->{body} .= ( ' ' x 512 ); + + # Return 500 + $c->res->status(500); } -=item $self->finalize_headers($c) +=head2 $self->finalize_headers($c) =cut sub finalize_headers { } -=item $self->finalize_read($c) +=head2 $self->finalize_read($c) =cut @@ -214,7 +277,7 @@ sub finalize_read { undef $self->{_prepared_read}; } -=item $self->finalize_uploads($c) +=head2 $self->finalize_uploads($c) =cut @@ -231,7 +294,7 @@ sub finalize_uploads { } } -=item $self->prepare_body($c) +=head2 $self->prepare_body($c) =cut @@ -249,10 +312,17 @@ sub prepare_body { while ( my $buffer = $self->read($c) ) { $c->prepare_body_chunk($buffer); } + + # paranoia against wrong Content-Length header + my $remaining = $self->read_length - $self->read_position; + if ($remaining > 0) { + $self->finalize_read($c); + Catalyst::Exception->throw("Wrong Content-Length value: ". $self->read_length); + } } } -=item $self->prepare_body_chunk($c) +=head2 $self->prepare_body_chunk($c) =cut @@ -262,7 +332,7 @@ sub prepare_body_chunk { $c->request->{_body}->add($chunk); } -=item $self->prepare_body_parameters($c) +=head2 $self->prepare_body_parameters($c) =cut @@ -271,13 +341,13 @@ sub prepare_body_parameters { $c->request->body_parameters( $c->request->{_body}->param ); } -=item $self->prepare_connection($c) +=head2 $self->prepare_connection($c) =cut sub prepare_connection { } -=item $self->prepare_cookies($c) +=head2 $self->prepare_cookies($c) =cut @@ -289,13 +359,13 @@ sub prepare_cookies { } } -=item $self->prepare_headers($c) +=head2 $self->prepare_headers($c) =cut sub prepare_headers { } -=item $self->prepare_parameters($c) +=head2 $self->prepare_parameters($c) =cut @@ -322,15 +392,15 @@ sub prepare_parameters { } } -=item $self->prepare_path($c) +=head2 $self->prepare_path($c) =cut sub prepare_path { } -=item $self->prepare_request($c) +=head2 $self->prepare_request($c) -=item $self->prepare_query_parameters($c) +=head2 $self->prepare_query_parameters($c) =cut @@ -341,14 +411,14 @@ sub prepare_query_parameters { $query_string =~ s/;/&/g; my $u = URI->new( '', 'http' ); - $u->query( $query_string ); - for my $key ( $u->query_param ) { - my @vals = $u->query_param($key); - $c->request->query_parameters->{$key} = @vals > 1 ? [@vals] : $vals[0]; + $u->query($query_string); + for my $key ( $u->query_param ) { + my @vals = $u->query_param($key); + $c->request->query_parameters->{$key} = @vals > 1 ? [@vals] : $vals[0]; } } -=item $self->prepare_read($c) +=head2 $self->prepare_read($c) =cut @@ -359,13 +429,13 @@ sub prepare_read { $self->read_position(0); } -=item $self->prepare_request(@arguments) +=head2 $self->prepare_request(@arguments) =cut sub prepare_request { } -=item $self->prepare_uploads($c) +=head2 $self->prepare_uploads($c) =cut @@ -386,21 +456,21 @@ sub prepare_uploads { push @uploads, $u; } $c->request->uploads->{$name} = @uploads > 1 ? \@uploads : $uploads[0]; - + # support access to the filename as a normal param my @filenames = map { $_->{filename} } @uploads; - $c->request->parameters->{$name} - = @filenames > 1 ? \@filenames : $filenames[0]; + $c->request->parameters->{$name} = + @filenames > 1 ? \@filenames : $filenames[0]; } } -=item $self->prepare_write($c) +=head2 $self->prepare_write($c) =cut sub prepare_write { } -=item $self->read($c, [$maxlength]) +=head2 $self->read($c, [$maxlength]) =cut @@ -433,7 +503,7 @@ sub read { } } -=item $self->read_chunk($c, $buffer, $length) +=head2 $self->read_chunk($c, $buffer, $length) Each engine inplements read_chunk as its preferred way of reading a chunk of data. @@ -442,22 +512,22 @@ of data. sub read_chunk { } -=item $self->read_length +=head2 $self->read_length The length of input data to be read. This is obtained from the Content-Length header. -=item $self->read_position +=head2 $self->read_position The amount of input data that has already been read. -=item $self->run($c) +=head2 $self->run($c) =cut sub run { } -=item $self->write($c, $buffer) +=head2 $self->write($c, $buffer) =cut @@ -472,8 +542,6 @@ sub write { print STDOUT $buffer; } -=back - =head1 AUTHORS Sebastian Riedel,