httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r663669 - /httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
Date Thu, 05 Jun 2008 17:27:32 GMT
Author: wrowe
Date: Thu Jun  5 10:27:32 2008
New Revision: 663669

URL: http://svn.apache.org/viewvc?rev=663669&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


Modified:
    httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c

Modified: httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c?rev=663669&r1=663668&r2=663669&view=diff
==============================================================================
--- httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c (original)
+++ httpd/httpd/trunk/server/mpm/winnt/mpm_winnt.c Thu Jun  5 10:27:32 2008
@@ -1612,10 +1612,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
@@ -1631,6 +1627,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 */
     {



Mime
View raw message