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 mpm_winnt.c
Date Thu, 04 Apr 2002 23:33:44 GMT
wrowe       02/04/04 15:33:44

  Modified:    server/mpm/winnt mpm_winnt.c
  Log:
    Another, potential race.  Assure we are allowing worker threads to finish
    from the time we begin our shutdown exercise.
  
  Revision  Changes    Path
  1.257     +5 -5      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.256
  retrieving revision 1.257
  diff -u -r1.256 -r1.257
  --- mpm_winnt.c	4 Apr 2002 23:32:36 -0000	1.256
  +++ mpm_winnt.c	4 Apr 2002 23:33:44 -0000	1.257
  @@ -1289,6 +1289,11 @@
        */
       shutdown_in_progress = 1;
   
  +    /* Tell the worker threads they may exit when done handling
  +     * a connection.
  +     */
  +    workers_may_exit = 1;
  +
       /* Close the listening sockets. */
       for (lr = ap_listeners; lr ; lr = lr->next) {
           apr_socket_close(lr->sd);
  @@ -1307,11 +1312,6 @@
           ap_log_error(APLOG_MARK,APLOG_ERR, rv, ap_server_conf, 
                        "Child %d: Failure releasing the start mutex", my_pid);
       }
  -
  -    /* Tell the worker threads they may exit when done handling
  -     * a connection.
  -     */
  -    workers_may_exit = 1;
   
       /* Shutdown the worker threads */
       if (osver.dwPlatformId == VER_PLATFORM_WIN32_WINDOWS) {
  
  
  

Mime
View raw message