From: Florian Ragwitz <rafl@debian.org>
Date: Sun, 5 Dec 2010 17:29:13 +0000 (+0000)
Subject: Set up MyApp->psgi_app lazily
X-Git-Tag: 5.89000~11
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?p=catagits%2FCatalyst-Runtime.git;a=commitdiff_plain;h=c8f4781ebd33f0476ed38e1daf05b0fc04446637

Set up MyApp->psgi_app lazily

This fixes the double inclusion through .psgi -> setup_psgi_app -> .psgi when
running with plackup.
---

diff --git a/lib/Catalyst.pm b/lib/Catalyst.pm
index f476307..388b71c 100644
--- a/lib/Catalyst.pm
+++ b/lib/Catalyst.pm
@@ -71,7 +71,7 @@ our $GO        = Catalyst::Exception::Go->new;
 __PACKAGE__->mk_classdata($_)
   for qw/components arguments dispatcher engine log dispatcher_class
   engine_class context_class request_class response_class stats_class
-  setup_finished psgi_app/;
+  setup_finished/;
 
 __PACKAGE__->dispatcher_class('Catalyst::Dispatcher');
 __PACKAGE__->engine_class('Catalyst::Engine');
@@ -2645,11 +2645,14 @@ sub setup_engine {
 
     $class->engine( $engine->new );
 
-    $class->psgi_app( $class->setup_psgi_app );
-
     return;
 }
 
+sub psgi_app {
+    my ($app) = @_;
+    $app->setup_psgi_app;
+}
+
 =head2 $c->setup_psgi_app
 
 Builds a PSGI application coderef for the catalyst application C<$c>.