httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Nathan Neulinger <nn...@umr.edu>
Subject Re: Removing AccessConfig and ResourceConfig dependency
Date Mon, 09 Dec 1996 13:52:24 GMT
Same here... I'd rather see a more general purpose include directive in the
configuration files.

-- Nathan

At 8:52 PM -0600 12/8/96, Randy Terbush wrote:
>Testing the waters with this one....
>
>Seems rather silly that we *require* these directives in the
>config file. A simple patch below removes the dependency.
>
>
>Index: http_config.c
>===================================================================
>RCS file: /export/home/cvs/apache/src/http_config.c,v
>retrieving revision 1.36
>diff -c -r1.36 http_config.c
>*** http_config.c	1996/12/05 00:33:24	1.36
>--- http_config.c	1996/12/09 02:37:44
>***************
>*** 963,972 ****
>  	if (virt->server_admin == NULL)
>  	    virt->server_admin = main_server->server_admin;
>
>! 	if (virt->srm_confname == NULL)
>  	    virt->srm_confname = main_server->srm_confname;
>
>! 	if (virt->access_confname == NULL)
>  	    virt->access_confname = main_server->access_confname;
>
>  	if (virt->timeout == 0)
>--- 963,972 ----
>  	if (virt->server_admin == NULL)
>  	    virt->server_admin = main_server->server_admin;
>
>! 	if (virt->srm_confname == NULL && main_server->srm_confname)
>  	    virt->srm_confname = main_server->srm_confname;
>
>! 	if (virt->access_confname == NULL && main_server->access_confname)
>  	    virt->access_confname = main_server->access_confname;
>
>  	if (virt->timeout == 0)
>***************
>*** 1016,1023 ****
>      s->server_hostname = NULL;
>      s->error_fname = DEFAULT_ERRORLOG;
>      s->error_log = stderr;
>!     s->srm_confname = RESOURCE_CONFIG_FILE;
>!     s->access_confname = ACCESS_CONFIG_FILE;
>      s->timeout = DEFAULT_TIMEOUT;
>      s->keep_alive_timeout = DEFAULT_KEEPALIVE_TIMEOUT;
>      s->keep_alive = DEFAULT_KEEPALIVE;
>--- 1016,1023 ----
>      s->server_hostname = NULL;
>      s->error_fname = DEFAULT_ERRORLOG;
>      s->error_log = stderr;
>!     s->srm_confname = NULL;
>!     s->access_confname = NULL;
>      s->timeout = DEFAULT_TIMEOUT;
>      s->keep_alive_timeout = DEFAULT_KEEPALIVE_TIMEOUT;
>      s->keep_alive = DEFAULT_KEEPALIVE;
>***************
>*** 1045,1052 ****
>      /* All server-wide config files now have the SAME syntax... */
>
>      process_resource_config (s, confname, p, ptemp);
>!     process_resource_config (s, s->srm_confname, p, ptemp);
>!     process_resource_config (s, s->access_confname, p, ptemp);
>
>      fixup_virtual_hosts (p, s);
>
>--- 1045,1054 ----
>      /* All server-wide config files now have the SAME syntax... */
>
>      process_resource_config (s, confname, p, ptemp);
>!     if (s->srm_confname)
>! 	process_resource_config (s, s->srm_confname, p, ptemp);
>!     if (s->access_confname)
>! 	process_resource_config (s, s->access_confname, p, ptemp);
>
>      fixup_virtual_hosts (p, s);
>
>Index: mod_info.c
>===================================================================
>RCS file: /export/home/cvs/apache/src/mod_info.c,v
>retrieving revision 1.7
>diff -c -r1.7 mod_info.c
>*** mod_info.c	1996/12/01 20:29:09	1.7
>--- mod_info.c	1996/12/09 02:41:37
>***************
>*** 269,278 ****
>  	if(!r->args || strcasecmp(r->args,"list")) {
>  		sprintf(buf,"%s/%s",server_root,server_confname);
>  		mod_info_cfg_httpd = mod_info_load_config(r->pool,buf);
>! 		sprintf(buf,"%s/%s",server_root,serv->srm_confname);
>! 		mod_info_cfg_srm = mod_info_load_config(r->pool,buf);
>! 		sprintf(buf,"%s/%s",server_root,serv->access_confname);
>! 		mod_info_cfg_access = mod_info_load_config(r->pool,buf);
>  		if(!r->args) {
>  			rputs("<tt><a href=\"#server\">Server Settings</a>,
>",r);
>  			for(modp = top_module; modp; modp = modp->next) {
>--- 269,282 ----
>  	if(!r->args || strcasecmp(r->args,"list")) {
>  		sprintf(buf,"%s/%s",server_root,server_confname);
>  		mod_info_cfg_httpd = mod_info_load_config(r->pool,buf);
>! 		if (serv->srm_confname) {
>! 		    sprintf(buf,"%s/%s",server_root,serv->srm_confname);
>! 		    mod_info_cfg_srm = mod_info_load_config(r->pool,buf);
>! 		}
>! 		if (serv->srm_confname) {
>! 		    sprintf(buf,"%s/%s",server_root,serv->access_confname);
>! 		    mod_info_cfg_access = mod_info_load_config(r->pool,buf);
>! 		}
>  		if(!r->args) {
>  			rputs("<tt><a href=\"#server\">Server Settings</a>,
>",r);
>  			for(modp = top_module; modp; modp = modp->next) {
>***************
>*** 378,386 ****
>  						cmd++;
>  					}
>  					rputs("<dt><strong>Current
>Configuration:</strong>\n",r);
>!
>	mod_info_module_cmds(r,mod_info_cfg_httpd,modp->cmds,"httpd.conf");
>
>!
>	mod_info_module_cmds(r,mod_info_cfg_srm,modp->cmds,"srm.conf");
>!
>	mod_info_module_cmds(r,mod_info_cfg_access,modp->cmds,"access.conf");
>  				}
>else {
>  					rputs("<tt> none</tt>\n",r);
>  				}
>--- 382,392 ----
>  						cmd++;
>  					}
>  					rputs("<dt><strong>Current
>Configuration:</strong>\n",r);
>!
>	mod_info_module_cmds(r,mod_info_cfg_httpd,modp->cmds,"httpd.conf");
>! 					if (mod_info_cfg_srm)
>!
>mod_info_module_cmds(r,mod_info_cfg_srm,modp->cmds,"srm.conf");
>! 					if (mod_info_cfg_access)
>!
>mod_info_module_cmds(r,mod_info_cfg_access,modp->cmds,"access.conf");
>  				} else {
>  					rputs("<tt> none</tt>\n",r);
>  				}


------------------------------------------------------------
Nathan Neulinger                  Univ. of Missouri - Rolla
EMail: nneul@umr.edu                  Computing Services
WWW: http://www.umr.edu/~nneul      SysAdmin: rollanet.org



Mime
View raw message