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 Mon, 23 Jun 2003 13:15:22 GMT
stoddard    2003/06/23 06:15:21

  Modified:    .        Tag: APACHE_2_0_BRANCH STATUS
               server/mpm/winnt Tag: APACHE_2_0_BRANCH child.c
  Log:
  Fix some broken log messages in WinNT MPM.
  
  Submitted by: Juan Rivera <Juan.Rivera@citrix.com>
  
  Revision  Changes    Path
  No                   revision
  No                   revision
  1.751.2.336 +1 -5      httpd-2.0/STATUS
  
  Index: STATUS
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/STATUS,v
  retrieving revision 1.751.2.335
  retrieving revision 1.751.2.336
  diff -u -r1.751.2.335 -r1.751.2.336
  --- STATUS	23 Jun 2003 13:07:19 -0000	1.751.2.335
  +++ STATUS	23 Jun 2003 13:15:20 -0000	1.751.2.336
  @@ -213,10 +213,6 @@
           modules/dav/main/mod_dav.h 1.67
           +1: striker, gstein
   
  -    * winnt MPM: fix some invalid ap_log_error() invocations
  -        server/mpm/winnt/child.c 1.15
  -        +1: trawick, wrowe, brianp, stoddard
  -
       * handle switching between libtools and unwritable ltconfig/ltmain.sh
           buildconf 1.36, 1.37
           build/.cvsignore 1.4
  
  
  
  No                   revision
  No                   revision
  1.9.2.4   +2 -2      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.3
  retrieving revision 1.9.2.4
  diff -u -r1.9.2.3 -r1.9.2.4
  --- child.c	13 Mar 2003 19:27:39 -0000	1.9.2.3
  +++ child.c	23 Jun 2003 13:15:21 -0000	1.9.2.4
  @@ -875,7 +875,7 @@
                   ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
                                "Child %d: _beginthreadex failed. Unable to create all worker
threads. "
                                "Created %d of the %d threads requested with the ThreadsPerChild
configuration directive.", 
  -                             threads_created, ap_threads_per_child);
  +                             my_pid, threads_created, ap_threads_per_child);
                   ap_signal_parent(SIGNAL_PARENT_SHUTDOWN);
                   goto shutdown;
               }
  @@ -942,7 +942,7 @@
               if (rv == WAIT_FAILED) {
               /* Something serious is wrong */
               ap_log_error(APLOG_MARK, APLOG_CRIT, apr_get_os_error(), ap_server_conf,
  -                         "Child %d: WAIT_FAILED -- shutting down server");
  +                         "Child %d: WAIT_FAILED -- shutting down server", my_pid);
               break;
           }
           else if (cld == 0) {
  
  
  

Mime
View raw message