cvs commit: apache-1.3/src/main http_main.c

[coar]

coar        98/10/26 13:27:42

  Modified:    src/main http_main.c
  Log:
        Parents and children were dealing with the event handles in
        a suboptimally-synchronised way.
  
  PR:           3255
  Submitted by: Ken Parzygnat <[EMAIL PROTECTED]>
  Reviewed by:  Ken Coar
  
  Revision  Changes    Path
  1.402     +3 -2      apache-1.3/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/main/http_main.c,v
  retrieving revision 1.401
  retrieving revision 1.402
  diff -u -r1.401 -r1.402
  --- http_main.c       1998/10/19 07:10:15     1.401
  +++ http_main.c       1998/10/26 21:27:40     1.402
  @@ -5654,8 +5654,6 @@
       APD2("*** main process shutdown, processes=%d ***", 
current_live_processes);
   
   die_now:
  -    CloseHandle(signal_restart_event);
  -    CloseHandle(signal_shutdown_event);
   
       tmstart = time(NULL);
       while (current_live_processes && ((tmstart+60) > time(NULL))) {
  @@ -5675,6 +5673,9 @@
            "forcing termination of child #%d (handle %d)", i, 
process_handles[i]);
        TerminateProcess((HANDLE) process_handles[i], 1);
       }
  +
  +    CloseHandle(signal_restart_event);
  +    CloseHandle(signal_shutdown_event);
   
       /* cleanup pid file on normal shutdown */
       {