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 Fri, 27 Aug 2004 18:46:53 GMT
stoddard    2004/08/27 11:46:53

  Modified:    .        Tag: APACHE_2_0_BRANCH CHANGES STATUS
               server/mpm/winnt Tag: APACHE_2_0_BRANCH mpm_winnt.c
  Log:
  Win32: Fix stranded piped loggers on apache -k start,restart,config,install
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.988.2.340 +5 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.339
  retrieving revision 1.988.2.340
  diff -u -r1.988.2.339 -r1.988.2.340
  --- CHANGES	27 Aug 2004 09:09:36 -0000	1.988.2.339
  +++ CHANGES	27 Aug 2004 18:46:50 -0000	1.988.2.340
  @@ -1,5 +1,10 @@
   Changes with Apache 2.0.51
   
  +  *) 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]
  +
     *) SECURITY: CAN-2004-0751 (cve.mitre.org)
        mod_ssl: Fix a segfault in the SSL input filter which could be
        triggered if using "speculative" mode, for instance by a 
  
  
  
  1.751.2.1028 +1 -6      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.1027
  retrieving revision 1.751.2.1028
  diff -u -r1.751.2.1027 -r1.751.2.1028
  --- STATUS	27 Aug 2004 16:08:31 -0000	1.751.2.1027
  +++ STATUS	27 Aug 2004 18:46:51 -0000	1.751.2.1028
  @@ -73,11 +73,6 @@
     [ please place file names and revisions from HEAD here, so it is easy to
       identify exactly what the proposed changes are! ]
   
  -    *) Win32: Orderly shutdown of the command process after apache -k start,restart,config,
  -       install to prevent stranded piped logger processes.
  -       http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/mpm/winnt/mpm_winnt.c?r1=1.311&r2=1.312
  -       +1: stoddard, trawick, nd
  -
       *) EOC bucket handling fix for core_output_filter (prevents possible variable use-
          after-free since .49).
          http://cvs.apache.org/viewcvs.cgi/httpd-2.0/server/core.c?r1=1.276&r2=1.277
  
  
  
  No                   revision
  No                   revision
  1.296.2.9 +12 -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.296.2.8
  retrieving revision 1.296.2.9
  diff -u -r1.296.2.8 -r1.296.2.9
  --- mpm_winnt.c	11 Jun 2004 20:27:27 -0000	1.296.2.8
  +++ mpm_winnt.c	27 Aug 2004 18:46:52 -0000	1.296.2.9
  @@ -1401,11 +1401,15 @@
   
       if (!strcasecmp(signal_arg, "install")) {
           rv = mpm_service_install(ptemp, inst_argc, inst_argv, 0);
  -        exit (rv);
  +        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);
  -        exit (rv);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
  +        exit(rv);
       }
   
       if (!strcasecmp(signal_arg, "start")) {
  @@ -1417,12 +1421,16 @@
               lr->active = 0;
           }
           rv = mpm_service_start(ptemp, inst_argc, inst_argv);
  -        exit (rv);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
  +        exit(rv);
       }
   
       if (!strcasecmp(signal_arg, "restart")) {
           mpm_signal_service(ptemp, 1);
  -        exit (rv);
  +        apr_pool_destroy(s->process->pool);
  +        apr_terminate();
  +        exit(rv);
       }
   
       if (parent_pid == my_pid) 
  
  
  

Mime
View raw message