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 Sat, 03 Feb 2001 19:37:12 GMT
stoddard    01/02/03 11:37:12

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
  Track a bit more child status in the Windows MPM
  
  Revision  Changes    Path
  1.131     +9 -2      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.130
  retrieving revision 1.131
  diff -u -r1.130 -r1.131
  --- mpm_winnt.c	2001/02/02 23:39:24	1.130
  +++ mpm_winnt.c	2001/02/03 19:37:12	1.131
  @@ -1130,7 +1130,7 @@
    *    accepted socket, instead of blocking on a mutex or select().
    */
   
  -static void worker_main(int child_num)
  +static void worker_main(int thread_num)
   {
       PCOMP_CONTEXT context = NULL;
       apr_os_sock_info_t sockinfo;
  @@ -1139,6 +1139,9 @@
           conn_rec *c;
           apr_int32_t disconnected;
   
  +        (void) ap_update_child_status(0, thread_num, SERVER_READY, 
  +                                      (request_rec *) NULL);
  +
           /* Grab a connection off the network */
           if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
               context = win9x_get_connection(context);
  @@ -1149,6 +1152,7 @@
   
           if (!context)
               break;
  +
           sock_disable_nagle(context->accept_socket);
   
           sockinfo.os_sock = &context->accept_socket;
  @@ -1158,8 +1162,11 @@
           sockinfo.type    = SOCK_STREAM;
           apr_make_os_sock(&context->sock, &sockinfo, context->ptrans);
   
  +        ap_update_child_status(0, thread_num,  
  +                               SERVER_BUSY_READ, (request_rec *) NULL);
  +
           c = ap_new_connection(context->ptrans, server_conf, context->sock,
  -                              child_num);
  +                              thread_num);
   
           ap_process_connection(c);
   
  
  
  

Mime
View raw message