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

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index 9e73489..49d8fc3 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -749,6 +749,19 @@ 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
+be dumped on the error page in debug mode.
+
+=cut
+
+sub dump_these {
+    my $c = shift;
+    [ Request => $c->req ], [ Response => $c->res ], [ Stash => $c->stash ],;
+}
+
 =item $c->execute($class, $coderef)
 
 Execute a coderef in given class and catch exceptions.
@@ -919,7 +932,7 @@ Finalize uploads.  Cleans up any temporary files.
 
 sub finalize_uploads { my $c = shift; $c->engine->finalize_uploads( $c, @_ ) }
 
-=item $c->get_action( $action, $namespace, $inherit )
+=item $c->get_action( $action, $namespace )
 
 Get an action in a given namespace.
 
@@ -927,6 +940,14 @@ Get an action in a given namespace.
 
 sub get_action { my $c = shift; $c->dispatcher->get_action( $c, @_ ) }
 
+=item $c->get_actions( $action, $namespace )
+
+Get all actions of a given name in a namespace and all base namespaces.
+
+=cut
+
+sub get_actions { my $c = shift; $c->dispatcher->get_actions( $c, @_ ) }
+
 =item handle_request( $class, @arguments )
 
 Handles the request.
@@ -1460,7 +1481,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 )
+    {
+        $old_engine = 1;
+    }
+    
+    elsif ( $engine->isa('Catalyst::Engine::Server::Base')
+         && Catalyst::Engine::Server->VERSION le '0.02' )
+    {
+        $old_engine = 1;
+    }
+    
+    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' )
+    {
+        $old_engine = 1;
+    }
 
+    if ($old_engine) {
+        Catalyst::Exception->throw( message =>
+            qq/Engine "$engine" is not supported by this version of Catalyst/
+        );
+    }
+            
     # engine instance
     $class->engine( $engine->new );
 }
@@ -1562,6 +1615,16 @@ sub version { return $Catalyst::VERSION }
 
 =back
 
+=head1 INTERNAL ACTIONS
+
+Catalyst uses internal actions like C<_DISPATCH>, C<_BEGIN>, C<_AUTO>
+C<_ACTION> and C<_END>, these are by default not shown in the private
+action table.
+
+But you can deactivate this with a config parameter.
+
+    MyApp->config->{show_internal_actions} = 1;
+
 =head1 CASE SENSITIVITY
 
 By default Catalyst is not case sensitive, so C<MyApp::C::FOO::Bar> becomes
@@ -1705,6 +1768,8 @@ Matt S Trout
 
 Robert Sedlacek
 
+Sam Vilain
+
 Tatsuhiko Miyagawa
 
 Ulf Edvinsson