[Catalyst-commits] r12665 - in Catalyst-Runtime/5.80/branches/psgi: . lib/Catalyst

[rafl at dev.catalyst.perl.org]

Author: rafl
Date: 2010-01-16 02:06:13 +0000 (Sat, 16 Jan 2010)
New Revision: 12665

Modified:
   Catalyst-Runtime/5.80/branches/psgi/TODO
   Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm
Log:
We still need to figure out how to not break mod_perl deployments.

Modified: Catalyst-Runtime/5.80/branches/psgi/TODO
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/TODO	2010-01-16 01:57:55 UTC (rev 12664)
+++ Catalyst-Runtime/5.80/branches/psgi/TODO	2010-01-16 02:06:13 UTC (rev 12665)
@@ -41,6 +41,7 @@
   * remove per-request state from the engine instance
   * be smarter about how we use PSGI - not every response needs to be delayed
     and streaming
+  * figure out how to not break existing mod_perl deployments
 
 ##  The horrible hack for plugin setup - replacing it:
 

Modified: Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm
===================================================================
--- Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm	2010-01-16 01:57:55 UTC (rev 12664)
+++ Catalyst-Runtime/5.80/branches/psgi/lib/Catalyst/Engine.pm	2010-01-16 02:06:13 UTC (rev 12665)
@@ -754,7 +754,8 @@
 sub run {
     my ($self, $app, $server, @args) = @_;
     $server ||= Plack::Loader->auto(); # We're not being called from a script,
-                                       # so auto detect mod_perl or whatever
+                                       # so auto detect what backend to run on.
+                                       # This does *NOT* cover mod_perl.
     # FIXME - Do something sensible with the options we're passed
     $server->run($self->build_psgi_app($app, @args));
 }