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

[t0m at dev.catalyst.perl.org]

Author: t0m
Date: 2009-05-21 19:42:09 +0000 (Thu, 21 May 2009)
New Revision: 10224

Modified:
   Catalyst-Devel/1.00/trunk/Changes
   Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
Log:
I fail at fixing things which don't have tests

Modified: Catalyst-Devel/1.00/trunk/Changes
===================================================================
--- Catalyst-Devel/1.00/trunk/Changes	2009-05-21 18:57:03 UTC (rev 10223)
+++ Catalyst-Devel/1.00/trunk/Changes	2009-05-21 19:42:09 UTC (rev 10224)
@@ -6,6 +6,8 @@
           that the restarter is as slow as ever on Win32, but it
           works. Thanks to Rodrigo for the bug report and suggestion
           on how to fix it. (Dave Rolsky)
+        - Actually fix -p option for port number, as I failed to do it
+          right last time as I'm an idiot (t0m)
 
 1.15    2009-05-13 20:02
         - Remove -p option for pid file, and restore it to the port number,

Modified: Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm
===================================================================
--- Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-05-21 18:57:03 UTC (rev 10223)
+++ Catalyst-Devel/1.00/trunk/lib/Catalyst/Helper.pm	2009-05-21 19:42:09 UTC (rev 10224)
@@ -898,6 +898,12 @@
 
 pod2usage(1) if $help;
 
+# as the IIS doesn't like output to STDERR keep it at STDOUT, otherwise the
+# server will return "Connection Interrupted"
+if ( $^O eq 'MSWin32' && exists($ENV{APP_POOL_ID}) ) {
+    $keep_stderr = 1;
+}
+
 [% name %]->run(
     $listen,
     {   nproc   => $nproc,
@@ -988,7 +994,7 @@
     'fork|f'              => \$fork,
     'help|?'              => \$help,
     'host=s'              => \$host,
-    'port=s'              => \$port,
+    'port|p=s'            => \$port,
     'keepalive|k'         => \$keepalive,
     'restart|r'           => \$restart,
     'restartdelay|rd=s'   => \$check_interval,