From: David Schmidt Date: Wed, 31 Dec 2014 11:38:32 +0000 (+0100) Subject: rm whitespace, fix typo, add contributor X-Git-Tag: 45.90078~2^2~1 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=c4df830e10aac24eb8ea9f0cb454d887b1761aa3 rm whitespace, fix typo, add contributor --- diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 32aea57..892fc4e 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -1897,7 +1897,7 @@ sub finalize { # Support skipping finalize for psgix.io style 'jailbreak'. Used to support # stuff like cometd and websockets - + if($c->request->_has_io_fh) { $c->log_response; return; @@ -3053,7 +3053,7 @@ sub setup_home { =head2 $c->setup_encoding -Sets up the input/output encoding. See L +Sets up the input/output encoding. See L =cut @@ -3286,7 +3286,7 @@ the plugin name does not begin with C. $class => @roles ) if @roles; } -} +} =head2 registered_middlewares @@ -3345,7 +3345,7 @@ sub registered_middlewares { sub setup_middleware { my $class = shift; - my @middleware_definitions = @_ ? + my @middleware_definitions = @_ ? reverse(@_) : reverse(@{$class->config->{'psgi_middleware'}||[]}); my @middleware = (); @@ -3512,7 +3512,7 @@ There are a number of 'base' config variables which can be set: C - As of version 5.90060 Catalyst rethrows errors conforming to the interface described by L and lets the middleware deal with it. -Set true to get the deprecated behaviour and have Catakyst catch HTTP exceptions. +Set true to get the deprecated behaviour and have Catalyst catch HTTP exceptions. =item * @@ -3571,7 +3571,7 @@ to be shown in hit debug tables in the test server. =item * C - Controls if the C or C environment -variable should be used for determining the request path. +variable should be used for determining the request path. Most web server environments pass the requested path to the application using environment variables, from which Catalyst has to reconstruct the request base (i.e. the top level path to / in the application, @@ -3610,7 +3610,7 @@ is having paths rewritten into it (e.g. as a .cgi/fcgi in a public_html director at other URIs than that which the app is 'normally' based at with C), the resolution of C<< $c->request->base >> will be incorrect. -=back +=back =item * @@ -3628,7 +3628,7 @@ When there is an error in an action chain, the default behavior is to continue processing the remaining actions and then catch the error upon chain end. This can lead to running actions when the application is in an unexpected state. If you have this issue, setting this config value to true will promptly exit a -chain when there is an error raised in any action (thus terminating the chain +chain when there is an error raised in any action (thus terminating the chain early.) use like: @@ -3674,7 +3674,7 @@ your stack, such as in a model that an Action is calling) that exception is caught by Catalyst and unless you either catch it yourself (via eval or something like L or by reviewing the L stack, it will eventually reach L and return either the debugging -error stack page, or the default error page. However, if your exception +error stack page, or the default error page. However, if your exception can be caught by L, L will instead rethrow it so that it can be handled by that middleware (which is part of the default middleware). For example this would allow @@ -3684,7 +3684,7 @@ is part of the default middleware). For example this would allow sub throws_exception :Local { my ($self, $c) = @_; - http_throw(SeeOther => { location => + http_throw(SeeOther => { location => $c->uri_for($self->action_for('redirect')) }); } @@ -4078,6 +4078,8 @@ Chisel Wright C Danijel Milicevic C +davewood: David Schmidt + David Kamholz Edkamholz@cpan.orgE David Naughton, C