httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apache-2.0/mpm/src/main http_connection.c mpm_prefork.c
Date Sun, 20 Jun 1999 23:09:54 GMT
dgaudet     99/06/20 16:09:54

  Modified:    mpm/src/include ap_mpm.h
               mpm/src/main http_connection.c mpm_prefork.c
  Log:
  ap_mpm_graceful_stop -> ap_graceful_stop_signalled
  
  Revision  Changes    Path
  1.4       +1 -1      apache-2.0/mpm/src/include/ap_mpm.h
  
  Index: ap_mpm.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/include/ap_mpm.h,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ap_mpm.h	1999/06/20 22:05:13	1.3
  +++ ap_mpm.h	1999/06/20 23:09:51	1.4
  @@ -112,7 +112,7 @@
   
   /* predicate indicating if a graceful stop has been requested ...
      used by the connection loop */
  -API_EXPORT(int) ap_mpm_graceful_stop(void);
  +API_EXPORT(int) ap_graceful_stop_signalled(void);
   
   /* a mutex which synchronizes threads within one process */
   typedef struct ap_thread_mutex ap_thread_mutex;
  
  
  
  1.4       +1 -1      apache-2.0/mpm/src/main/http_connection.c
  
  Index: http_connection.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/main/http_connection.c,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- http_connection.c	1999/06/19 20:23:37	1.3
  +++ http_connection.c	1999/06/20 23:09:53	1.4
  @@ -206,7 +206,7 @@
   
   	ap_destroy_pool(r->pool);
   
  -	if (ap_mpm_graceful_stop()) {
  +	if (ap_graceful_stop_signalled()) {
   	    /* XXX: hey wait, this should do a lingering_close! */
   	    ap_bclose(c->client);
   	    return;
  
  
  
  1.7       +3 -3      apache-2.0/mpm/src/main/mpm_prefork.c
  
  Index: mpm_prefork.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/mpm/src/main/mpm_prefork.c,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- mpm_prefork.c	1999/06/20 22:59:51	1.6
  +++ mpm_prefork.c	1999/06/20 23:09:53	1.7
  @@ -2377,7 +2377,7 @@
       requests_this_child = ap_max_requests_per_child = 1;
   }
   
  -int ap_mpm_graceful_stop(void)
  +int ap_graceful_stop_signalled(void)
   {
       ap_sync_scoreboard_image();
       if (deferred_die ||
  @@ -2431,7 +2431,7 @@
       }
   #endif
   
  -    while (!ap_mpm_graceful_stop()) {
  +    while (!ap_graceful_stop_signalled()) {
   	BUFF *conn_io;
   
   	/* Prepare to receive a SIGUSR1 due to graceful restart so that
  @@ -2581,7 +2581,7 @@
   		}
   	    }
   
  -	    if (ap_mpm_graceful_stop()) {
  +	    if (ap_graceful_stop_signalled()) {
   		clean_child_exit(0);
   	    }
   	    usr1_just_die = 1;
  
  
  

Mime
View raw message