Back out - what the hell was the unexpected hunk. I fail at today.

diff --git a/Changes b/Changes
index 379163f..2413ae2 100644 (file)
--- a/Changes
+++ b/Changes
@@ -6,8 +6,6 @@ This file documents the revision history for Perl extension Catalyst-Devel.
           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,

diff --git a/lib/Catalyst/Helper.pm b/lib/Catalyst/Helper.pm
index 52d40fe..8ab9ad2 100644 (file)
--- a/lib/Catalyst/Helper.pm
+++ b/lib/Catalyst/Helper.pm
@@ -898,12 +898,6 @@ GetOptions(
 
 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,
@@ -994,7 +988,7 @@ GetOptions(
     'fork|f'              => \$fork,
     'help|?'              => \$help,
     'host=s'              => \$host,
-    'port|p=s'            => \$port,
+    'port=s'              => \$port,
     'keepalive|k'         => \$keepalive,
     'restart|r'           => \$restart,
     'restartdelay|rd=s'   => \$check_interval,