Commit 5e05bdd3 authored by Bill Stoddard's avatar Bill Stoddard
Browse files

Win32: Enable reliable piped log support. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@89134 13f79535-47bb-0310-9956-ffa450edef68
parent 0c145a3a

CHANGES

+5 −0
Original line number Diff line number Diff line 
Changes with Apache 2.0.18-dev

  *) Win32: Add support for reliable piped logs. If the logging process

     goes down, Apache will automatically restart it. This function has 

     been part of Apache on Unix/Linux/BSD since the early v1.3 releases.

     [Bill Stoddard]



  *) Do not start piped log processes during the config file 

     preflight.  This change also circumvents a problem on 

     Windows where the rotatelog processes created during preflight

server/mpm/winnt/mpm_winnt.c

+2 −5
Original line number Diff line number Diff line
@@ -1060,7 +1060,7 @@ static void child_main() 
     *    number of completion contexts, etc.)

     */

    while (1) {

        rv = WaitForMultipleObjects(2, (HANDLE *) child_events, FALSE, INFINITE);

        rv = WaitForMultipleObjects(2, (HANDLE *) child_events, FALSE, 1000);

        cld = rv - WAIT_OBJECT_0;

        if (rv == WAIT_FAILED) {

            /* Something serious is wrong */
@@ -1069,10 +1069,7 @@ static void child_main() 
            break;

        }

        else if (rv == WAIT_TIMEOUT) {

            /* Hey, this cannot happen */

            ap_log_error(APLOG_MARK, APLOG_CRIT, APR_SUCCESS, server_conf,

                         "Child %d: WAIT_TIMEOUT -- shutting down server", my_pid);

            break;

            apr_proc_other_child_check();

        }

        else if (cld == 0) {

            /* Exit event was signaled */