[Catalyst-commits] r6611 - in trunk/Catalyst-Devel: . lib/Catalyst

[andyg at dev.catalyst.perl.org]

Author: andyg
Date: 2007-08-03 02:37:35 +0100 (Fri, 03 Aug 2007)
New Revision: 6611

Modified:
   trunk/Catalyst-Devel/Changes
   trunk/Catalyst-Devel/lib/Catalyst/Helper.pm
Log:
Devel: Don't change a manually-specified engine when using the -r switch

Modified: trunk/Catalyst-Devel/Changes
===================================================================
--- trunk/Catalyst-Devel/Changes	2007-08-02 14:28:20 UTC (rev 6610)
+++ trunk/Catalyst-Devel/Changes	2007-08-03 01:37:35 UTC (rev 6611)
@@ -2,14 +2,16 @@
 
         - Changed default dependency to Catalyst::Runtime
         - Added BindLex example to create script
+        - Don't change a manually-specified engine when using the
+          -r switch with server.pl
         
 1.02    2006-11-15
         - Added dep to Catalyst::Manual
         - added option to send errors to STDOUT in fastcgi script
 
 1.01	2006-09-17 23:49:00
-	- Upped M::I dependency
-	- fix for warnings
+       - Upped M::I dependency
+	   - fix for warnings
 
 1.00    2006-07-06 19:23:00
         - Initial release

Modified: trunk/Catalyst-Devel/lib/Catalyst/Helper.pm
===================================================================
--- trunk/Catalyst-Devel/lib/Catalyst/Helper.pm	2007-08-02 14:28:20 UTC (rev 6610)
+++ trunk/Catalyst-Devel/lib/Catalyst/Helper.pm	2007-08-03 01:37:35 UTC (rev 6611)
@@ -879,7 +879,7 @@
 
 pod2usage(1) if $help;
 
-if ( $restart ) {
+if ( $restart && $ENV{CATALYST_ENGINE} eq 'HTTP' ) {
     $ENV{CATALYST_ENGINE} = 'HTTP::Restarter';
 }
 if ( $debug ) {