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 Thu, 10 Dec 1998 20:51:57 GMT
jim         98/12/10 12:51:57

  Modified:    src/main http_main.c
  Log:
  Thanks to Dean for making me take a 2nd look
  
  Revision  Changes    Path
  1.410     +11 -10    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.409
  retrieving revision 1.410
  diff -u -r1.409 -r1.410
  --- http_main.c	1998/12/10 15:14:08	1.409
  +++ http_main.c	1998/12/10 20:51:56	1.410
  @@ -2069,18 +2069,19 @@
   				       sizeof(ss->request));
   	    }
   	    ss->vhostrec =  r->server;
  -	} else if (status == SERVER_STARTING) {
  -	    /* clean up the slot's vhostrec pointer (maybe re-used)
  -	     * and mark the slot as belonging to a new generation.
  -	     */
  -	    ss->vhostrec = NULL;
  -	    ap_scoreboard_image->parent[child_num].generation = ap_my_generation;
  +	}
  +    }
  +    if (status == SERVER_STARTING && r == NULL) {
  +	/* clean up the slot's vhostrec pointer (maybe re-used)
  +	 * and mark the slot as belonging to a new generation.
  +	 */
  +	ss->vhostrec = NULL;
  +	ap_scoreboard_image->parent[child_num].generation = ap_my_generation;
   #ifdef SCOREBOARD_FILE
  -	    lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[child_num]), 0);
  -	    force_write(scoreboard_fd, &ap_scoreboard_image->parent[child_num],
  -		sizeof(parent_score));
  +	lseek(scoreboard_fd, XtOffsetOf(scoreboard, parent[child_num]), 0);
  +	force_write(scoreboard_fd, &ap_scoreboard_image->parent[child_num],
  +	    sizeof(parent_score));
   #endif
  -	}
       }
       put_scoreboard_info(child_num, ss);
   
  
  
  

Mime
View raw message