Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r663671 -
 /httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c
Date: Thu, 05 Jun 2008 17:28:09 -0000
To: cvs@httpd.apache.org
From: wrowe@apache.org
Message-Id: <20080605172809.52E3C2388A1E@eris.apache.org>

Author: wrowe
Date: Thu Jun  5 10:28:08 2008
New Revision: 663671

URL: http://svn.apache.org/viewvc?rev=663671&view=rev
Log:
For winnt_mpm console mode, always reset our console handler to be the first,
even on a restart, because some modules (e.g. mod_perl) might have set a console
handler to terminate the process.

PR: 44800 (part 1/3)
Submitted by: tdonovan
Backports: r663669

Modified:
    httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c?rev=663671&r1=663670&r2=663671&view=diff
==============================================================================
--- httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/branches/2.0.x/server/mpm/winnt/mpm_winnt.c Thu Jun  5 10:28:08 2008
@@ -1553,10 +1553,6 @@
                     }
                 }
             }
-            else /* ! -k runservice */
-            {
-                mpm_start_console_handler();
-            }
 
             /* Create the start mutex, as an unnamed object for security.
              * Ths start mutex is used during a restart to prevent more than 
@@ -1572,6 +1568,12 @@
                 return HTTP_INTERNAL_SERVER_ERROR;
             }            
         }
+        /* Always reset our console handler to be the first, even on a restart
+        *  because some modules (e.g. mod_perl) might have set a console 
+        *  handler to terminate the process.
+        */
+        if (strcasecmp(signal_arg, "runservice"))
+            mpm_start_console_handler();
     }
     else /* parent_pid != my_pid */
     {