Merge branch 'master' into psgi

* master:
  Lion is like Snow Leopard when it comes to tar issues
  Warning fix
  Add _set_env writer to non-PSGI Catalyst
  Remove trailing whitespace

Conflicts:
	lib/Catalyst/Engine.pm
	lib/Catalyst/Engine/CGI.pm

diff --git a/lib/Catalyst/DispatchType/Chained.pm b/lib/Catalyst/DispatchType/Chained.pm
index 5ed6088..9c32258 100644 (file)
--- a/lib/Catalyst/DispatchType/Chained.pm
+++ b/lib/Catalyst/DispatchType/Chained.pm
@@ -203,7 +203,7 @@ sub recurse_match {
             if (my $capture_attr = $action->attributes->{CaptureArgs}) {
 
                 # Short-circuit if not enough remaining parts
-                next TRY_ACTION unless @parts >= $capture_attr->[0];
+                next TRY_ACTION unless @parts >= ($capture_attr->[0]||0);
 
                 my @captures;
                 my @parts = @parts; # localise

diff --git a/lib/Catalyst/DispatchType/Path.pm b/lib/Catalyst/DispatchType/Path.pm
index 4c23aaa..0578ff4 100644 (file)
--- a/lib/Catalyst/DispatchType/Path.pm
+++ b/lib/Catalyst/DispatchType/Path.pm
@@ -57,10 +57,10 @@ sub list {
         foreach my $action ( @{ $self->_paths->{$path} } ) {
             my $args  = $action->attributes->{Args}->[0];
             my $parts = defined($args) ? '/*' x $args : '/...';
-            
+
             my $display_path = "/$path/$parts";
             $display_path =~ s{/{1,}}{/}g;
-             
+
             $paths->row( $display_path, "/$action" );
         }
     }