Re: module config (b4 is broken)

[Ben Laurie <be...@gonzo.ben.algroup.co.uk>]

Randy Terbush wrote:
> 
> 
> 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;

Ahem. This code is from the Apache-SSL patch... I keep meaning to add it to
the main code. Easily spotted coz it uses Hungarian...

Cheers,

Ben.

>       
>       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 {
> 
> 

-- 
Ben Laurie                  Phone: +44 (181) 994 6435
Freelance Consultant and    Fax:   +44 (181) 994 6472
Technical Director          Email: ben@algroup.co.uk
A.L. Digital Ltd,           URL: http://www.algroup.co.uk
London, England.