httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Randy Terbush <ra...@zyzzyva.com>
Subject Re: module config (b4 is broken)
Date Mon, 17 Jun 1996 19:52:18 GMT

To answer my own question, I have narrowed down the behavior
I described to the following changes.


*** http_main.c.old	Mon Jun 17 14:46:53 1996
--- http_main.c.current	Mon Jun 17 14:41:49 1996
***************
*** 1352,1358 ****
  void standalone_main(int argc, char **argv)
  {
      struct sockaddr_in sa_server;
-     static BOOL bFirst=TRUE;
  
      standalone = 1;
      sd = listenmaxfd = -1;
--- 1352,1357 ----
***************
*** 1382,1402 ****
  	log_error ("SIGHUP received.  Attempting to restart", server_conf);
      }
      
!     if(!bFirst)
!     {
! 	restart_time = time(NULL);
! 	clear_pool (pconf);
! 	ptrans = make_sub_pool (pconf);
! 	server_conf = read_config(pconf, ptrans, server_confname); 
!     }
!     else
! 	bFirst=FALSE;
      
      open_logs(server_conf, pconf);
      set_group_privs();
      accept_mutex_init(pconf);
      reinit_scoreboard(pconf);
      
      if (listeners == NULL)
      {
  	memset((char *) &sa_server, 0, sizeof(sa_server));
--- 1381,1398 ----
  	log_error ("SIGHUP received.  Attempting to restart", server_conf);
      }
      
!     restart_time = time(NULL);
!     clear_pool (pconf);
!     ptrans = make_sub_pool (pconf);
      
+     server_conf = read_config(pconf, ptrans, server_confname); 
      open_logs(server_conf, pconf);
      set_group_privs();
      accept_mutex_init(pconf);
      reinit_scoreboard(pconf);
      
+     default_server_hostnames (server_conf);
+ 
      if (listeners == NULL)
      {
  	memset((char *) &sa_server, 0, sizeof(sa_server));
***************
*** 1519,1524 ****
--- 1515,1521 ----
      server_conf = read_config (pconf, ptrans, server_confname);
      
      if(standalone) {
+         clear_pool (pconf);	/* standalone_main rereads... */
          standalone_main(argc, argv);
      }
      else {



Mime
View raw message