X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=blobdiff_plain;f=lib%2FCatalyst.pm;h=71ce8cce0070baa35e90db9a4b62015571c4170b;hp=49d8fc3449c8ce06c630b7f1ebf1e518668572cf;hb=c4770d9b88bb84708a170f0d21484b6ad5123f3f;hpb=7f92deef6d24d2a7618ba679892189838fcb4dfd

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 49d8fc3..71ce8cc 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -38,7 +38,7 @@ our $DETACH    = "catalyst_detach\n";
 require Module::Pluggable::Fast;
 
 # Helper script generation
-our $CATALYST_SCRIPT_GEN = 9;
+our $CATALYST_SCRIPT_GEN = 10;
 
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log/;
@@ -426,6 +426,7 @@ sub uri_for {
     # massage match, empty if absolute path
     $match =~ s/^\///;
     $match .= '/' if $match;
+    $path ||= '';
     $match = '' if $path =~ /^\//;
     $path =~ s/^\///;
 
@@ -749,7 +750,6 @@ Dispatch request to actions.
 
 sub dispatch { my $c = shift; $c->dispatcher->dispatch( $c, @_ ) }
 
-
 =item dump_these
 
 Returns a list of 2-element array references (name, structure) pairs that will
@@ -797,7 +797,11 @@ sub execute {
         {
             my ( $elapsed, @state ) =
               $c->benchmark( $code, $class, $c, @{ $c->req->args } );
-            push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
+            unless ( ( $code->name =~ /^_.*/ )
+                && ( !$c->config->{show_internal_actions} ) )
+            {
+                push @{ $c->{stats} }, [ $action, sprintf( '%fs', $elapsed ) ];
+            }
             $c->state(@state);
         }
         else {
@@ -1481,39 +1485,39 @@ sub setup_engine {
 qq/Couldn't load engine "$engine" (maybe you forgot to install it?), "$@"/
         );
     }
-    
+
     # check for old engines that are no longer compatible
     my $old_engine;
-    if (   $engine->isa('Catalyst::Engine::Apache')
-        && ! Catalyst::Engine::Apache->VERSION )
+    if ( $engine->isa('Catalyst::Engine::Apache')
+        && !Catalyst::Engine::Apache->VERSION )
     {
         $old_engine = 1;
     }
-    
+
     elsif ( $engine->isa('Catalyst::Engine::Server::Base')
-         && Catalyst::Engine::Server->VERSION le '0.02' )
+        && Catalyst::Engine::Server->VERSION le '0.02' )
     {
         $old_engine = 1;
     }
-    
-    elsif ( $engine->isa('Catalyst::Engine::HTTP::POE')
-         && $engine->VERSION eq '0.01' )
+
+    elsif ($engine->isa('Catalyst::Engine::HTTP::POE')
+        && $engine->VERSION eq '0.01' )
     {
         $old_engine = 1;
     }
-    
-    elsif ( $engine->isa('Catalyst::Engine::Zeus')
-         && $engine->VERSION eq '0.01' )
+
+    elsif ($engine->isa('Catalyst::Engine::Zeus')
+        && $engine->VERSION eq '0.01' )
     {
         $old_engine = 1;
     }
 
     if ($old_engine) {
         Catalyst::Exception->throw( message =>
-            qq/Engine "$engine" is not supported by this version of Catalyst/
+              qq/Engine "$engine" is not supported by this version of Catalyst/
         );
     }
-            
+
     # engine instance
     $class->engine( $engine->new );
 }