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 Wed, 25 Aug 2004 14:47:18 GMT
stoddard    2004/08/25 07:47:18

  Modified:    .        CHANGES
               server/mpm/winnt mpm_winnt.c
  Log:
  Win32: Fix stranded piped loggers on apache -k start,restart,config,install
  
  Revision  Changes    Path
  1.1565    +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.1564
  retrieving revision 1.1565
  diff -u -r1.1564 -r1.1565
  --- CHANGES	23 Aug 2004 20:53:22 -0000	1.1564
  +++ CHANGES	25 Aug 2004 14:47:17 -0000	1.1565
  @@ -1,6 +1,10 @@
   Changes with Apache 2.1.0-dev
   
     [Remove entries to the current 2.0 section below, when backported]
  +  *) Win32: apache -k start|restart|install|config can leave stranded
  +     piped logger processes (eg, rotatelogs.exe) due to improper
  +     server shutdown on these code paths.
  +     [Bill Stoddard]
   
     *) Restructured mod_auth_ldap to fit the new authentication model.
        The module is now called authnz_ldap and has been moved out of
  
  
  
  1.312     +8 -0      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.311
  retrieving revision 1.312
  diff -u -r1.311 -r1.312
  --- mpm_winnt.c	24 Apr 2004 11:23:14 -0000	1.311
  +++ mpm_winnt.c	25 Aug 2004 14:47:18 -0000	1.312
  @@ -1409,10 +1409,14 @@
   
       if (!strcasecmp(signal_arg, "install")) {
           rv = mpm_service_install(ptemp, inst_argc, inst_argv, 0);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
           exit (rv);
       }
       if (!strcasecmp(signal_arg, "config")) {
           rv = mpm_service_install(ptemp, inst_argc, inst_argv, 1);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
           exit (rv);
       }
   
  @@ -1425,11 +1429,15 @@
               lr->active = 0;
           }
           rv = mpm_service_start(ptemp, inst_argc, inst_argv);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
           exit (rv);
       }
   
       if (!strcasecmp(signal_arg, "restart")) {
           mpm_signal_service(ptemp, 1);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
           exit (rv);
       }
   
  
  
  

Mime
View raw message