r69029 - in /trunk/libcatalyst-perl: ./ debian/ inc/Module/ inc/Module/Install/ lib/ lib/Catalyst/ lib/Catalyst/Engine/ t/aggregate/ t/lib/TestApp/Controller/Action/
jawnsy-guest at users.alioth.debian.org
jawnsy-guest at users.alioth.debian.org
Sat Feb 19 01:32:56 UTC 2011
Author: jawnsy-guest
Date: Sat Feb 19 01:32:49 2011
New Revision: 69029
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=69029
Log:
looks good, dch -r
Modified:
trunk/libcatalyst-perl/Changes
trunk/libcatalyst-perl/META.yml
trunk/libcatalyst-perl/Makefile.PL
trunk/libcatalyst-perl/debian/changelog
trunk/libcatalyst-perl/debian/control
trunk/libcatalyst-perl/inc/Module/Install.pm
trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm
trunk/libcatalyst-perl/inc/Module/Install/Base.pm
trunk/libcatalyst-perl/inc/Module/Install/Can.pm
trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm
trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm
trunk/libcatalyst-perl/inc/Module/Install/Include.pm
trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm
trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm
trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm
trunk/libcatalyst-perl/inc/Module/Install/Win32.pm
trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm
trunk/libcatalyst-perl/lib/Catalyst.pm
trunk/libcatalyst-perl/lib/Catalyst/Engine/FastCGI.pm
trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t
trunk/libcatalyst-perl/t/lib/TestApp/Controller/Action/Chained.pm
Modified: trunk/libcatalyst-perl/Changes
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/Changes?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/Changes (original)
+++ trunk/libcatalyst-perl/Changes Sat Feb 19 01:32:49 2011
@@ -1,4 +1,16 @@
# This file documents the revision history for Perl extension Catalyst.
+
+5.80031 2011-01-31 08:13:02
+
+ Bug fixes:
+ - Update dependency on MooseX::Role::WithOverloading to ensure that
+ a version which can deal with / depends on a new Package::Stash
+ is installed. (As if some other dependency is pulled in during upgrading
+ which results in new Package::Stash, then it can leave you with a broken
+ version of MooseX::Role::WithOverloading.
+
+ - Fix undef warning in Catalyst::Engine::FastCGI when writing an empty
+ body (e.g. doing a redirect)
5.80030 2011-01-04 13:13:02
Modified: trunk/libcatalyst-perl/META.yml
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/META.yml?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/META.yml (original)
+++ trunk/libcatalyst-perl/META.yml Sat Feb 19 01:32:49 2011
@@ -10,7 +10,7 @@
configure_requires:
ExtUtils::MakeMaker: 6.42
distribution_type: module
-generated_by: 'Module::Install version 1.00'
+generated_by: 'Module::Install version 0.99'
license: perl
meta-spec:
url: http://module-build.sourceforge.net/META-spec-v1.4.html
@@ -25,6 +25,7 @@
CGI::Simple::Cookie: 1.109
Carp: 0
Class::C3::Adopt::NEXT: 0.07
+ Class::Data::Inheritable: 0
Class::MOP: 0.95
Data::Dump: 0
Data::OptList: 0
@@ -43,7 +44,7 @@
MooseX::Emulate::Class::Accessor::Fast: 0.00903
MooseX::Getopt: 0.30
MooseX::MethodAttributes::Inheritable: 0.24
- MooseX::Role::WithOverloading: 0.05
+ MooseX::Role::WithOverloading: 0.09
MooseX::Types: 0
MooseX::Types::Common::Numeric: 0
Path::Class: 0.09
@@ -51,6 +52,8 @@
String::RewritePrefix: 0.004
Sub::Exporter: 0
Task::Weaken: 0
+ Test::Exception: 0
+ Test::More: 0.88
Text::Balanced: 0
Text::SimpleTable: 0.03
Time::HiRes: 0
@@ -66,4 +69,4 @@
homepage: http://dev.catalyst.perl.org/
license: http://dev.perl.org/licenses/
repository: http://dev.catalyst.perl.org/repos/Catalyst/Catalyst-Runtime/
-version: 5.80030
+version: 5.80031
Modified: trunk/libcatalyst-perl/Makefile.PL
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/Makefile.PL?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/Makefile.PL (original)
+++ trunk/libcatalyst-perl/Makefile.PL Sat Feb 19 01:32:49 2011
@@ -21,7 +21,7 @@
requires 'Class::MOP' => '0.95';
requires 'Moose' => '1.03';
requires 'MooseX::MethodAttributes::Inheritable' => '0.24';
-requires 'MooseX::Role::WithOverloading' => '0.05';
+requires 'MooseX::Role::WithOverloading' => '0.09';
requires 'Carp';
requires 'Class::C3::Adopt::NEXT' => '0.07';
requires 'CGI::Simple::Cookie' => '1.109';
Modified: trunk/libcatalyst-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/debian/changelog?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/debian/changelog (original)
+++ trunk/libcatalyst-perl/debian/changelog Sat Feb 19 01:32:49 2011
@@ -1,3 +1,11 @@
+libcatalyst-perl (5.80031-1) unstable; urgency=low
+
+ * New upstream release
+ * Cleaned up dependencies (put each on their own lines) to make
+ diffs more useful
+
+ -- Jonathan Yu <jawnsy at cpan.org> Fri, 18 Feb 2011 20:55:44 -0500
+
libcatalyst-perl (5.80030-1) unstable; urgency=low
* New upstream release.
Modified: trunk/libcatalyst-perl/debian/control
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/debian/control?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/debian/control (original)
+++ trunk/libcatalyst-perl/debian/control Sat Feb 19 01:32:49 2011
@@ -2,22 +2,49 @@
Section: perl
Priority: optional
Build-Depends: debhelper (>= 7.0.50)
-Build-Depends-Indep: perl, libfile-slurp-perl, libtest-exception-perl,
- libextutils-autoinstall-perl, libdata-dump-perl, libtest-pod-perl,
- libclass-inspector-perl, libtest-pod-coverage-perl, libcgi-simple-perl (>= 1.109),
- libclass-data-inheritable-perl, libclass-accessor-perl, libwww-perl (>= 5.814),
- libpath-class-perl, libtext-simpletable-perl, libtree-simple-perl,
- libtree-simple-visitorfactory-perl, libfcgi-perl, libtest-mockobject-perl,
- libhttp-body-perl (>= 1.06), libfile-modified-perl, libhttp-request-ascgi-perl (>= 0.8),
- libmime-types-perl, libfile-copy-recursive-perl, libtest-nowarnings-perl,
- perl (>= 5.10.1) | libmodule-pluggable-perl (>= 3.9), libfcgi-procmanager-perl,
- libmoosex-methodattributes-perl (>= 0.24), libmoosex-emulate-class-accessor-fast-perl,
- libclass-c3-perl, libmoose-perl (>= 1.03), libclass-c3-adopt-next-perl,
- libscope-upper-perl, libtask-weaken-perl, libmoosex-types-common-perl,
- libmoosex-getopt-perl (>= 0.30), libparent-perl, libnamespace-autoclean-perl,
- libstring-rewriteprefix-perl, libmoosex-role-withoverloading-perl,
- libnamespace-clean-perl (>= 0.12), libdata-optlist-perl,
- perl (>= 5.10.1) | libtest-simple-perl (>= 0.88), libhtml-parser-perl
+Build-Depends-Indep: perl,
+ libfile-slurp-perl,
+ libtest-exception-perl,
+ libextutils-autoinstall-perl,
+ libdata-dump-perl,
+ libtest-pod-perl,
+ libclass-inspector-perl,
+ libtest-pod-coverage-perl,
+ libcgi-simple-perl (>= 1.109),
+ libclass-data-inheritable-perl,
+ libclass-accessor-perl,
+ libwww-perl (>= 5.814),
+ libpath-class-perl,
+ libtext-simpletable-perl,
+ libtree-simple-perl,
+ libtree-simple-visitorfactory-perl,
+ libfcgi-perl,
+ libtest-mockobject-perl,
+ libhttp-body-perl (>= 1.06),
+ libfile-modified-perl,
+ libhttp-request-ascgi-perl (>= 0.8),
+ libmime-types-perl,
+ libfile-copy-recursive-perl,
+ libtest-nowarnings-perl,
+ perl (>= 5.10.1) | libmodule-pluggable-perl (>= 3.9),
+ libfcgi-procmanager-perl,
+ libmoosex-methodattributes-perl (>= 0.24),
+ libmoosex-emulate-class-accessor-fast-perl,
+ libclass-c3-perl,
+ libmoose-perl (>= 1.03),
+ libclass-c3-adopt-next-perl,
+ libscope-upper-perl,
+ libtask-weaken-perl,
+ libmoosex-types-common-perl,
+ libmoosex-getopt-perl (>= 0.30),
+ libparent-perl,
+ libnamespace-autoclean-perl,
+ libstring-rewriteprefix-perl,
+ libmoosex-role-withoverloading-perl (>= 0.09),
+ libnamespace-clean-perl (>= 0.12),
+ libdata-optlist-perl,
+ perl (>= 5.10.1) | libtest-simple-perl (>= 0.88),
+ libhtml-parser-perl
Maintainer: Debian Perl Group <pkg-perl-maintainers at lists.alioth.debian.org>
Uploaders: Krzysztof Krzyżaniak (eloy) <eloy at debian.org>,
gregor herrmann <gregoa at debian.org>, Jonathan Yu <jawnsy at cpan.org>,
@@ -30,18 +57,41 @@
Package: libcatalyst-perl
Architecture: all
Depends: ${misc:Depends}, ${perl:Depends},
- libwww-perl (>= 5.814), libhtml-parser-perl, liburi-perl, libpath-class-perl,
- libtree-simple-visitorfactory-perl, libhttp-body-perl (>= 1.06), libfile-modified-perl,
- perl (>= 5.10.1) | libmodule-pluggable-perl (>= 3.9), libtext-simpletable-perl,
- libmoosex-methodattributes-perl (>= 0.24), libcgi-simple-perl (>= 1.109), libmoose-perl (>= 1.03),
- libmoosex-emulate-class-accessor-fast-perl, libstring-rewriteprefix-perl,
- libnamespace-clean-perl (>= 0.12), libmoosex-role-withoverloading-perl,
- libhttp-request-ascgi-perl (>= 0.8), libfile-slurp-perl, libdata-dump-perl,
- libmoosex-types-common-perl, libclass-accessor-perl, libclass-inspector-perl,
- libnamespace-autoclean-perl, libfile-copy-recursive-perl, libmime-types-perl,
- libclass-c3-adopt-next-perl, libtest-mockobject-perl, libmoosex-getopt-perl (>= 0.30),
- libextutils-autoinstall-perl, libtree-simple-perl, libtask-weaken-perl,
- libclass-c3-perl, libscope-upper-perl, libparent-perl, libdata-optlist-perl
+ libwww-perl (>= 5.814),
+ libhtml-parser-perl,
+ liburi-perl,
+ libpath-class-perl,
+ libtree-simple-visitorfactory-perl,
+ libhttp-body-perl (>= 1.06),
+ libfile-modified-perl,
+ perl (>= 5.10.1) | libmodule-pluggable-perl (>= 3.9),
+ libtext-simpletable-perl,
+ libmoosex-methodattributes-perl (>= 0.24),
+ libcgi-simple-perl (>= 1.109),
+ libmoose-perl (>= 1.03),
+ libmoosex-emulate-class-accessor-fast-perl,
+ libstring-rewriteprefix-perl,
+ libnamespace-clean-perl (>= 0.12),
+ libmoosex-role-withoverloading-perl (>= 0.09),
+ libhttp-request-ascgi-perl (>= 0.8),
+ libfile-slurp-perl,
+ libdata-dump-perl,
+ libmoosex-types-common-perl,
+ libclass-accessor-perl,
+ libclass-inspector-perl,
+ libnamespace-autoclean-perl,
+ libfile-copy-recursive-perl,
+ libmime-types-perl,
+ libclass-c3-adopt-next-perl,
+ libtest-mockobject-perl,
+ libmoosex-getopt-perl (>= 0.30),
+ libextutils-autoinstall-perl,
+ libtree-simple-perl,
+ libtask-weaken-perl,
+ libclass-c3-perl,
+ libscope-upper-perl,
+ libparent-perl,
+ libdata-optlist-perl
Recommends: libfcgi-perl, libcatalyst-devel-perl
Suggests: libtest-pod-perl, libtest-pod-coverage-perl,
libfcgi-procmanager-perl, libcatalyst-engine-apache-perl,
Modified: trunk/libcatalyst-perl/inc/Module/Install.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install.pm Sat Feb 19 01:32:49 2011
@@ -31,7 +31,7 @@
# This is not enforced yet, but will be some time in the next few
# releases once we can make sure it won't clash with custom
# Module::Install extensions.
- $VERSION = '1.00';
+ $VERSION = '0.99';
# Storage for the pseudo-singleton
$MAIN = undef;
@@ -230,12 +230,8 @@
sub new {
my ($class, %args) = @_;
- delete $INC{'FindBin.pm'};
- {
- # to suppress the redefine warning
- local $SIG{__WARN__} = sub {};
- require FindBin;
- }
+ delete $INC{'FindBin.pm'};
+ require FindBin;
# ignore the prefix on extension modules built from top level.
my $base_path = Cwd::abs_path($FindBin::Bin);
Modified: trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/AutoInstall.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
@@ -48,14 +48,6 @@
while (my ($mod, $ver) = splice(@requires, 0, 2)) {
$seen{$mod}{$ver}++;
}
- my @build_requires = map @$_, map @$_, grep ref, $self->build_requires;
- while (my ($mod, $ver) = splice(@build_requires, 0, 2)) {
- $seen{$mod}{$ver}++;
- }
- my @configure_requires = map @$_, map @$_, grep ref, $self->configure_requires;
- while (my ($mod, $ver) = splice(@configure_requires, 0, 2)) {
- $seen{$mod}{$ver}++;
- }
my @deduped;
while (my ($mod, $ver) = splice(@features_require, 0, 2)) {
Modified: trunk/libcatalyst-perl/inc/Module/Install/Base.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Base.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Base.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Base.pm Sat Feb 19 01:32:49 2011
@@ -4,7 +4,7 @@
use strict 'vars';
use vars qw{$VERSION};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
}
# Suspend handler for "redefined" warnings
Modified: trunk/libcatalyst-perl/inc/Module/Install/Can.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Can.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Can.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Can.pm Sat Feb 19 01:32:49 2011
@@ -9,7 +9,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/CheckConflicts.pm Sat Feb 19 01:32:49 2011
@@ -12,8 +12,10 @@
}
sub check_conflicts {
- my ($self, %conflicts) = @_;
-
+ my $self = shift;
+ # Deal with the fact that prompt_script calls us with just the script
+ # name by totally ignoring it. HACK!
+ my %conflicts = @_ unless scalar(@_) == 1;
my %conflicts_found;
for my $mod (sort keys %conflicts) {
next unless $self->can_use($mod);
@@ -62,4 +64,4 @@
__END__
-#line 122
+#line 124
Modified: trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Fetch.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Include.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Include.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Include.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Include.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Makefile.pm Sat Feb 19 01:32:49 2011
@@ -8,7 +8,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Metadata.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Scripts.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/Win32.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/Win32.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/Win32.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/Win32.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = 'Module::Install::Base';
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm (original)
+++ trunk/libcatalyst-perl/inc/Module/Install/WriteAll.pm Sat Feb 19 01:32:49 2011
@@ -6,7 +6,7 @@
use vars qw{$VERSION @ISA $ISCORE};
BEGIN {
- $VERSION = '1.00';
+ $VERSION = '0.99';
@ISA = qw{Module::Install::Base};
$ISCORE = 1;
}
Modified: trunk/libcatalyst-perl/lib/Catalyst.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst.pm Sat Feb 19 01:32:49 2011
@@ -79,7 +79,7 @@
# Remember to update this in Catalyst::Runtime as well!
-our $VERSION = '5.80030';
+our $VERSION = '5.80031';
sub import {
my ( $class, @arguments ) = @_;
Modified: trunk/libcatalyst-perl/lib/Catalyst/Engine/FastCGI.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst/Engine/FastCGI.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst/Engine/FastCGI.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst/Engine/FastCGI.pm Sat Feb 19 01:32:49 2011
@@ -158,6 +158,10 @@
sub write {
my ( $self, $c, $buffer ) = @_;
+
+ # ->write will be called once with the body, even in a redirect (and
+ # in that case, the body is undef)
+ $buffer = '' if !defined $buffer;
unless ( $self->_prepared_write ) {
$self->prepare_write($c);
Modified: trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm (original)
+++ trunk/libcatalyst-perl/lib/Catalyst/Runtime.pm Sat Feb 19 01:32:49 2011
@@ -7,7 +7,7 @@
# Remember to update this in Catalyst as well!
-our $VERSION = '5.80030';
+our $VERSION = '5.80031';
=head1 NAME
Modified: trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t (original)
+++ trunk/libcatalyst-perl/t/aggregate/live_component_controller_action_chained.t Sat Feb 19 01:32:49 2011
@@ -844,6 +844,33 @@
is( $response->header('X-Catalyst-Executed'),
$expected, 'Executed actions' );
is( $response->content, '; ', 'Content OK' );
+ }
+
+ #
+ # Complex path with multiple non-capturing pathparts
+ # PathPart('') CaptureArgs(0), PathPart('foo') CaptureArgs(0), PathPart('') Args(0)
+ # should win over PathPart('') CaptureArgs(1), PathPart('') Args(0)
+ #
+ {
+ my @expected = qw[
+ TestApp::Controller::Action::Chained->begin
+ TestApp::Controller::Action::Chained->mult_nopp2_base
+ TestApp::Controller::Action::Chained->mult_nopp2_nocap
+ TestApp::Controller::Action::Chained->mult_nopp2_action
+ TestApp::Controller::Action::Chained->mult_nopp2_action_default
+ TestApp::Controller::Action::Chained->end
+ ];
+
+ my $expected = join( ", ", @expected );
+
+ ok( my $response = request('http://localhost/chained/mult_nopp2/action'),
+ "Complex path with multiple non-capturing pathparts" );
+ TODO: {
+ local $TODO = 'Known bug';
+ is( $response->header('X-Catalyst-Executed'),
+ $expected, 'Executed actions' );
+ is( $response->content, '; ', 'Content OK' );
+ }
}
#
Modified: trunk/libcatalyst-perl/t/lib/TestApp/Controller/Action/Chained.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libcatalyst-perl/t/lib/TestApp/Controller/Action/Chained.pm?rev=69029&op=diff
==============================================================================
--- trunk/libcatalyst-perl/t/lib/TestApp/Controller/Action/Chained.pm (original)
+++ trunk/libcatalyst-perl/t/lib/TestApp/Controller/Action/Chained.pm Sat Feb 19 01:32:49 2011
@@ -164,6 +164,14 @@
sub mult_nopp_idall : Chained('mult_nopp_id') PathPart('') Args(0) { }
sub mult_nopp_idnew : Chained('mult_nopp_id') PathPart('new') Args(0) { }
+sub mult_nopp2_base : Chained('/') PathPart('chained/mult_nopp2') CaptureArgs(0) { }
+sub mult_nopp2_nocap : Chained('mult_nopp2_base') PathPart('') CaptureArgs(0) { }
+sub mult_nopp2_action : Chained('mult_nopp2_nocap') PathPart('action') CaptureArgs(0) { }
+sub mult_nopp2_action_default : Chained('mult_nopp2_action') PathPart('') Args(0) { }
+sub mult_nopp2_action_with_arg : Chained('mult_nopp2_action') PathPart('') Args(1) { }
+sub mult_nopp2_load : Chained('mult_nopp2_base') PathPart('') CaptureArgs(1) { }
+sub mult_nopp2_view : Chained('mult_nopp2_load') PathPart('') Args(0) { }
+
#
# Test Choice between branches and early return logic
# Declaration order is important for $children->{$*}, since this is first match best.
More information about the Pkg-perl-cvs-commits
mailing list