httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: httpd-2.0/server/mpm/winnt child.c
Date Sun, 04 Aug 2002 18:25:47 GMT
wrowe       2002/08/04 11:25:47

  Modified:    server/mpm/winnt child.c
  Log:
    Outch!  Always check completion against actual socket/pipe/file handles,
    never look at the completion event itself.  Could be part of the zone
    alarm mischief.  Note also that waiting on two events is better than
    waking every few minutes.  Factoring out max_requests_per_child_hit
    or whatever that event name is will help here.
  
  Revision  Changes    Path
  1.3       +5 -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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- child.c	29 Jul 2002 05:12:50 -0000	1.2
  +++ child.c	4 Aug 2002 18:25:47 -0000	1.3
  @@ -536,11 +536,14 @@
                   continue;
               }
   
  -            /* Wait for pending i/o. Wake up once per second to check for shutdown */
  +            /* Wait for pending i/o. 
  +             * Wake up once per second to check for shutdown .
  +             * XXX: We should be waiting on exit_event instead of polling
  +             */
               while (1) {
                   rv = WaitForSingleObject(context->Overlapped.hEvent, 1000);
                   if (rv == WAIT_OBJECT_0) {
  -                    if (!GetOverlappedResult(context->Overlapped.hEvent, 
  +                    if (!GetOverlappedResult(context->accept_socket, 
                                                &context->Overlapped, 
                                                &BytesRead, FALSE)) {
                           ap_log_error(APLOG_MARK,APLOG_WARNING, GetLastError(), ap_server_conf,
  
  
  

Mime
View raw message