From: John Napiorkowski Date: Wed, 22 Jul 2015 17:22:27 +0000 (-0500) Subject: Merge branch 'dim0xff-fix/RouteMatching.pod' into orpington X-Git-Tag: 5.90094~4^2~5 X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=72ff6cffc45d5298c906ad136e3e8cc765c7ee11;hp=26abb70733120828ebd6026e3ce8907385a53608 Merge branch 'dim0xff-fix/RouteMatching.pod' into orpington --- diff --git a/Changes b/Changes index d842512..f5b5718 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,10 @@ # This file documents the revision history for Perl extension Catalyst. +5.90099_001 - TBA + - Merged Pull Requests: + - https://github.com/perl-catalyst/catalyst-runtime/pull/96 + - https://github.com/perl-catalyst/catalyst-runtime/pull/98 + 5.90093 - 2015-05-29 - Fixed a bug where if you used $res->write and then $res->body, the contents of body would be double encoded (gshank++). diff --git a/README.mkdn b/README.mkdn index f30025c..d673134 100644 --- a/README.mkdn +++ b/README.mkdn @@ -1440,7 +1440,7 @@ variable should be used for determining the request path. decoded, this means that applications using this mode can correctly handle URIs including the %2F character (i.e. with `AllowEncodedSlashes` set to `On` in Apache). - Given that this method of path resolution is provably more correct, it is recommended that you use + Given that this method of path resolution is probably more correct, it is recommended that you use this unless you have a specific need to deploy your application in a non-standard environment, and you are aware of the implications of not being able to handle encoded URI paths correctly. @@ -1454,7 +1454,7 @@ variable should be used for determining the request path. - `using_frontend_proxy_path` - Enabled [Plack::Middleware::ReverseProxyPath](https://metacpan.org/pod/Plack::Middleware::ReverseProxyPath) on your application (if installed, otherwise log an error). This is useful if your application is not running on the 'root' (or /) of your host server. **NOTE** if you use this feature you should add the required -middleware to your project dependency list since its not automatically a dependency of [Catalyst](https://metacpan.org/pod/Catalyst). +middleware to your project dependency list since it's not automatically a dependency of [Catalyst](https://metacpan.org/pod/Catalyst). This has been done since not all people need this feature and we wish to restrict the growth of [Catalyst](https://metacpan.org/pod/Catalyst) dependencies. - `encoding` - See ["ENCODING"](#encoding) @@ -1515,7 +1515,7 @@ This has been done since not all people need this feature and we wish to restric - `do_not_decode_query` If true, then do not try to character decode any wide characters in your - request URL query or keywords. Most readings of the relevent specifications + request URL query or keywords. Most readings of the relevant specifications suggest these should be UTF-\* encoded, which is the default that [Catalyst](https://metacpan.org/pod/Catalyst) will use, hwoever if you are creating a lot of URLs manually or have external evil clients, this might cause you trouble. If you find the changes introduced @@ -2009,7 +2009,7 @@ acme: Leon Brocard abraxxa: Alexander Hartmaier -andrewalker: André Walker +andrewalker: André Walker Andrew Bramble @@ -2067,7 +2067,7 @@ groditi: Guillermo Roditi hobbs: Andrew Rodland -ilmari: Dagfinn Ilmari Mannsåker +ilmari: Dagfinn Ilmari MannsÃ¥ker jcamacho: Juan Camacho diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm index 0148bd2..b79df55 100644 --- a/lib/Catalyst.pm +++ b/lib/Catalyst.pm @@ -180,7 +180,7 @@ sub composed_stats_class { __PACKAGE__->_encode_check(Encode::FB_CROAK | Encode::LEAVE_SRC); # Remember to update this in Catalyst::Runtime as well! -our $VERSION = '5.90093'; +our $VERSION = '5.90099_001'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases sub import { @@ -521,7 +521,7 @@ L<< detach|/"$c->detach( $action [, \@arguments ] )" >>. Like C<< $c->visit >>, C<< $c->go >> will perform a full dispatch on the specified action or method, with localized C<< $c->action >> and C<< $c->namespace >>. Like C, C escapes the processing of the current request chain on completion, and -does not return to its cunless blessed $cunless blessed $caller. +does not return to its caller. @arguments are arguments to the final destination of $action. @captures are arguments to the intermediate steps, if any, on the way to the final sub of diff --git a/lib/Catalyst/Runtime.pm b/lib/Catalyst/Runtime.pm index 8332312..6307069 100644 --- a/lib/Catalyst/Runtime.pm +++ b/lib/Catalyst/Runtime.pm @@ -7,7 +7,7 @@ BEGIN { require 5.008003; } # Remember to update this in Catalyst as well! -our $VERSION = '5.90093'; +our $VERSION = '5.90099_001'; $VERSION = eval $VERSION if $VERSION =~ /_/; # numify for warning-free dev releases =head1 NAME