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=ff2e79785161a6f657c76698942a3019ef7491b2;hp=920fe0e6e84cde964671d08ad53b215ada9a8146;hb=4ab87e274ac0a05f98c10a4cdba467ba4398b0d3;hpb=6484fba0d3daff654c5f419bc91b6bf6229e188f diff --git a/lib/Catalyst/Engine.pm b/lib/Catalyst/Engine.pm index 920fe0e..ff2e797 100644 --- a/lib/Catalyst/Engine.pm +++ b/lib/Catalyst/Engine.pm @@ -30,13 +30,8 @@ See L. =head1 METHODS -=over 4 -=item $self->finalize_output - -, see finalize_body - -=item $self->finalize_body($c) +=head2 $self->finalize_body($c) Finalize body. Prints the response output. @@ -56,7 +51,9 @@ sub finalize_body { } } -=item $self->finalize_cookies($c) +=head2 $self->finalize_cookies($c) + +Create CGI::Cookies from $c->res->cookies, and set them as response headers. =cut @@ -78,12 +75,16 @@ 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) + +Output an apropriate error message, called if there's an error in $c +after the dispatch has finished. Will output debug messages if Catalyst +is in debug mode, or a `please come back later` message otherwise. =cut @@ -98,12 +99,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

"; + $name = "

$name

"; # Don't show context in the dump delete $c->req->{_context}; @@ -127,7 +131,7 @@ sub finalize_error { push @infos, sprintf <<"EOF", $name, $value;

%s

%s

%s

EOF $i++; @@ -141,12 +145,10 @@ EOF

 (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 = ''; @@ -219,7 +221,6 @@ EOF display: block; margin: 1em 0; overflow: auto; - white-space: pre; } div.name h1, div.error p { margin: 0; @@ -235,6 +236,15 @@ EOF font-size: medium; font-weight: normal; } + /* from http://users.tkk.fi/~tkarvine/linux/doc/pre-wrap/pre-wrap-css3-mozilla-opera-ie.html */ + /* Browser specific (not valid) styles to make preformatted text wrap */ + pre { + white-space: pre-wrap; /* css-3 */ + white-space: -moz-pre-wrap; /* Mozilla, since 1999 */ + white-space: -pre-wrap; /* Opera 4-6 */ + white-space: -o-pre-wrap; /* Opera 7 */ + word-wrap: break-word; /* Internet Explorer 5.5+ */ + } @@ -246,15 +256,23 @@ EOF + + # Trick IE + $c->res->{body} .= ( ' ' x 512 ); + + # Return 500 + $c->res->status(500); } -=item $self->finalize_headers($c) +=head2 $self->finalize_headers($c) + +Abstract method, allows engines to write headers to response =cut sub finalize_headers { } -=item $self->finalize_read($c) +=head2 $self->finalize_read($c) =cut @@ -264,7 +282,9 @@ sub finalize_read { undef $self->{_prepared_read}; } -=item $self->finalize_uploads($c) +=head2 $self->finalize_uploads($c) + +Clean up after uploads, deleting temp files. =cut @@ -281,7 +301,9 @@ sub finalize_uploads { } } -=item $self->prepare_body($c) +=head2 $self->prepare_body($c) + +sets up the L object body using L =cut @@ -299,10 +321,19 @@ 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) + +Add a chunk to the request body. =cut @@ -312,7 +343,9 @@ sub prepare_body_chunk { $c->request->{_body}->add($chunk); } -=item $self->prepare_body_parameters($c) +=head2 $self->prepare_body_parameters($c) + +Sets up parameters from body. =cut @@ -321,13 +354,17 @@ sub prepare_body_parameters { $c->request->body_parameters( $c->request->{_body}->param ); } -=item $self->prepare_connection($c) +=head2 $self->prepare_connection($c) + +Abstract method implemented in engines. =cut sub prepare_connection { } -=item $self->prepare_cookies($c) +=head2 $self->prepare_cookies($c) + +Parse cookies from header. Sets a L object. =cut @@ -339,13 +376,15 @@ 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) + +sets up parameters from query and post parameters. =cut @@ -372,15 +411,19 @@ sub prepare_parameters { } } -=item $self->prepare_path($c) +=head2 $self->prepare_path($c) + +abstract method, implemented by engines. =cut sub prepare_path { } -=item $self->prepare_request($c) +=head2 $self->prepare_request($c) + +=head2 $self->prepare_query_parameters($c) -=item $self->prepare_query_parameters($c) +process the query string and extract query parameters. =cut @@ -398,7 +441,9 @@ sub prepare_query_parameters { } } -=item $self->prepare_read($c) +=head2 $self->prepare_read($c) + +prepare to read from the engine. =cut @@ -409,13 +454,15 @@ sub prepare_read { $self->read_position(0); } -=item $self->prepare_request(@arguments) +=head2 $self->prepare_request(@arguments) + +Populate the context object from the request object. =cut sub prepare_request { } -=item $self->prepare_uploads($c) +=head2 $self->prepare_uploads($c) =cut @@ -444,13 +491,15 @@ sub prepare_uploads { } } -=item $self->prepare_write($c) +=head2 $self->prepare_write($c) + +Abstract method. Implemented by the engines. =cut sub prepare_write { } -=item $self->read($c, [$maxlength]) +=head2 $self->read($c, [$maxlength]) =cut @@ -483,7 +532,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. @@ -492,22 +541,26 @@ 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) + +Start the engine. Implemented by the various engine classes. =cut sub run { } -=item $self->write($c, $buffer) +=head2 $self->write($c, $buffer) + +Writes the buffer to the client. Can only be called once for a request. =cut @@ -522,7 +575,9 @@ sub write { print STDOUT $buffer; } -=back +=head2 $self->finalize_output + +, see finalize_body =head1 AUTHORS