httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dgau...@hyperreal.org
Subject cvs commit: apachen/src/main http_main.c
Date Wed, 15 Oct 1997 00:14:33 GMT
dgaudet     97/10/14 17:14:33

  Modified:    src/main http_main.c
  Log:
  clear_pool() was called before copy_listeners, and copy_listeners was using
  pointers from the cleared pool.
  
  close(scoreboard_fd) was happening before the scoreboard was even opened.
  
  Reviewed by:	Jim Jagielski, Rob Hartill
  
  Revision  Changes    Path
  1.235     +2 -3      apachen/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /export/home/cvs/apachen/src/main/http_main.c,v
  retrieving revision 1.234
  retrieving revision 1.235
  diff -u -r1.234 -r1.235
  --- http_main.c	1997/10/07 19:34:01	1.234
  +++ http_main.c	1997/10/15 00:14:31	1.235
  @@ -1406,7 +1406,7 @@
   #else
   #define SCOREBOARD_FILE
   static scoreboard _scoreboard_image;
  -static int scoreboard_fd;
  +static int scoreboard_fd = -1;
   
   /* XXX: things are seriously screwed if we ever have to do a partial
    * read or write ... we could get a corrupted scoreboard
  @@ -3122,7 +3122,7 @@
   	    restart_time = time(NULL);
   	}
   #ifdef SCOREBOARD_FILE
  -	else {
  +	else if (scoreboard_fd != -1) {
   	    kill_cleanups_for_fd(pconf, scoreboard_fd);
   	}
   #endif
  @@ -3392,7 +3392,6 @@
       init_modules(pconf, server_conf);
   
       if (standalone) {
  -	clear_pool(pconf);	/* standalone_main rereads... */
   	STANDALONE_MAIN(argc, argv);
       }
       else {
  
  
  

Mime
View raw message