httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From stodd...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt mpm_winnt.c
Date Mon, 11 Feb 2002 15:24:46 GMT
stoddard    02/02/11 07:24:46

  Modified:    .        CHANGES
               server/mpm/winnt mpm_winnt.c
  Log:
  Get apache -k restart -n apache2 working reliabily again.
  
  Revision  Changes    Path
  1.574     +2 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.573
  retrieving revision 1.574
  diff -u -r1.573 -r1.574
  --- CHANGES	11 Feb 2002 04:56:09 -0000	1.573
  +++ CHANGES	11 Feb 2002 15:24:45 -0000	1.574
  @@ -1,4 +1,6 @@
   Changes with Apache 2.0.32-dev
  +  *) Win32: Get apache -k restart -n apache2 working reliabily again.
  +     [Bill Stoddard]
    
     *) Remove all signals from the worker MPM's child process.  Instead,
        the parent uses the Pipe of Death for all communication with the
  
  
  
  1.230     +4 -4      httpd-2.0/server/mpm/winnt/mpm_winnt.c
  
  Index: mpm_winnt.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/mpm_winnt.c,v
  retrieving revision 1.229
  retrieving revision 1.230
  diff -u -r1.229 -r1.230
  --- mpm_winnt.c	8 Feb 2002 19:37:02 -0000	1.229
  +++ mpm_winnt.c	11 Feb 2002 15:24:46 -0000	1.230
  @@ -1496,7 +1496,7 @@
       }
   
       /* Child's initial stderr -> our main server error log (or, failing that, stderr)
*/
  -    if (ap_server_conf->error_log) {
  +    if (ap_server_conf->error_log) { /* Is this check really necessary?*/
           rv = apr_os_file_get(&hShareError, ap_server_conf->error_log);
           if (rv == APR_SUCCESS && hShareError != INVALID_HANDLE_VALUE) {
               if (DuplicateHandle(hCurrentProcess, hShareError, 
  @@ -1524,9 +1524,9 @@
               CloseHandle(hNullOutput);
               return -1;
           }
  -        else {
  -            hShareError = GetStdHandle(STD_ERROR_HANDLE);
  -        }
  +    }
  +    else {
  +        hShareError = GetStdHandle(STD_ERROR_HANDLE);
       }
   
       /* Create the child_exit_event */
  
  
  

Mime
View raw message