httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From j..@hyperreal.org
Subject cvs commit: apache-1.3/src/main http_main.c
Date Fri, 11 Dec 1998 15:33:41 GMT
jim         98/12/11 07:33:41

  Modified:    src/main http_main.c
  Log:
  This fixes the problem I was seeing on various platforms with non-Graceful
  restarts. It also explains why Graceful restarts worked OK. It looks like
  something similar might be needed for the Win32 sections of the code where
  ap_my_generation is adjusted in it's similar loop, but I ain't touching
  that! :)
  
  Revision  Changes    Path
  1.411     +3 -3      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.410
  retrieving revision 1.411
  diff -u -r1.410 -r1.411
  --- http_main.c	1998/12/10 20:51:56	1.410
  +++ http_main.c	1998/12/11 15:33:40	1.411
  @@ -4410,13 +4410,13 @@
   	 * use by any of the children.
   	 */
   	++ap_my_generation;
  +	ap_scoreboard_image->global.running_generation = ap_my_generation;
  +	update_scoreboard_global();
  +
   	if (is_graceful) {
   #ifndef SCOREBOARD_FILE
   	    int i;
   #endif
  -	    ap_scoreboard_image->global.running_generation = ap_my_generation;
  -	    update_scoreboard_global();
  -
   	    ap_log_error(APLOG_MARK, APLOG_NOERRNO|APLOG_NOTICE, server_conf,
   			"SIGUSR1 received.  Doing graceful restart");
   
  
  
  

Mime
View raw message