From: Bill Stoddard <stoddard@apache.org>
Date: Sat, 3 Feb 2001 19:37:12 +0000 (+0000)
Subject: Track a bit more child status in the Windows MPM
X-Git-Tag: APACHE_2_0_BETA_CANDIDATE_1~10
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=9c617be14e69587a1de6eb24a172727887ee788c;p=apache

Track a bit more child status in the Windows MPM


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@87964 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/server/mpm/winnt/mpm_winnt.c b/server/mpm/winnt/mpm_winnt.c
index 1e18d0d450..ed9a22d62e 100644
--- a/server/mpm/winnt/mpm_winnt.c
+++ b/server/mpm/winnt/mpm_winnt.c
@@ -1130,7 +1130,7 @@ static PCOMP_CONTEXT winnt_get_connection(PCOMP_CONTEXT context)
  *    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 @@ static void worker_main(int child_num)
         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 @@ static void worker_main(int child_num)
 
         if (!context)
             break;
+
         sock_disable_nagle(context->accept_socket);
 
         sockinfo.os_sock = &context->accept_socket;
@@ -1158,8 +1162,11 @@ static void worker_main(int child_num)
         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);