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 child.c
Date Thu, 26 Aug 2004 01:03:30 GMT
stoddard    2004/08/25 18:03:29

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS CHANGES
               server/mpm/winnt Tag: APACHE_2_0_BRANCH child.c
  Log:
  WinNT MPM: Fix a broken log message at termination.
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.1007 +1 -9      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.1006
  retrieving revision 1.751.2.1007
  diff -u -r1.751.2.1006 -r1.751.2.1007
  --- STATUS	25 Aug 2004 15:20:15 -0000	1.751.2.1006
  +++ STATUS	26 Aug 2004 01:03:20 -0000	1.751.2.1007
  @@ -194,14 +194,6 @@
          0: nd: IMHO that's a public API change then and not applicable for
                 2.0, just let 'em in
   
  -    *) Prevent Win32 pool corruption at startup
  -         server/mpm/winnt/child.c: r1.36 
  -       +1: ake, trawick, nd, stoddard
  -
  -    *) WinNT MPM: Fix a broken log message at termination.  PR 28063.
  -         server/mpm/winnt/child.c: r1.37
  -       +1: trawick, nd
  -
       *) mod_actions: Regression from 1.3: the file referred to must exist.
          Solve this by introducing the "virtual" modifier to the Action
          directive. PR 28553.
  
  
  
  1.988.2.331 +4 -0      httpd-2.0/CHANGES
  
  Index: CHANGES
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/CHANGES,v
  retrieving revision 1.988.2.330
  retrieving revision 1.988.2.331
  diff -u -r1.988.2.330 -r1.988.2.331
  --- CHANGES	26 Aug 2004 00:53:33 -0000	1.988.2.330
  +++ CHANGES	26 Aug 2004 01:03:22 -0000	1.988.2.331
  @@ -1,4 +1,8 @@
   Changes with Apache 2.0.51
  +
  +  *) WinNT MPM: Fix a broken log message at termination.  PR 28063.
  +     [Eider Oliveira <eider bol.com.br>]
  +
     *) Prevent Win32 pool corruption at startup [Allan Edwards]
   
     *) mod_ssl: Add "SSLUserName" directive to set r->user based on a
  
  
  
  No                   revision
  No                   revision
  1.9.2.17  +2 -1      httpd-2.0/server/mpm/winnt/child.c
  
  Index: child.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/server/mpm/winnt/child.c,v
  retrieving revision 1.9.2.16
  retrieving revision 1.9.2.17
  diff -u -r1.9.2.16 -r1.9.2.17
  --- child.c	26 Aug 2004 00:53:39 -0000	1.9.2.16
  +++ child.c	26 Aug 2004 01:03:29 -0000	1.9.2.17
  @@ -1080,7 +1080,8 @@
       /* Kill remaining threads off the hard way */
       if (threads_created) {
           ap_log_error(APLOG_MARK,APLOG_NOTICE, APR_SUCCESS, ap_server_conf, 
  -                     "Child %d: Terminating %d threads that failed to exit.", my_pid);
  +                     "Child %d: Terminating %d threads that failed to exit.", 
  +                     my_pid, threads_created);
       }
       for (i = 0; i < threads_created; i++) {
           int *score_idx;
  
  
  

Mime
View raw message