Commit 7827d711 authored by Manoj Kasichainula's avatar Manoj Kasichainula
Browse files

Eliminate implicit usage of access.conf and srm.conf. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@84771 13f79535-47bb-0310-9956-ffa450edef68
parent 53e748b3

include/ap_config.h

+0 −6
Changes for include/ap_config.h: 0 added lines, 6 removed lines.
Original line number Diff line number Diff line
@@ -476,15 +476,9 @@ typedef int pid_t; 
#ifndef SERVER_CONFIG_FILE

#define SERVER_CONFIG_FILE      "Configuration/Server"

#endif

#ifndef RESOURCE_CONFIG_FILE

#define RESOURCE_CONFIG_FILE    "Configuration/Resources"

#endif

#ifndef TYPES_CONFIG_FILE

#define TYPES_CONFIG_FILE       "Configuration/MIME"

#endif

#ifndef ACCESS_CONFIG_FILE

#define ACCESS_CONFIG_FILE      "Configuration/Access"

#endif

#ifndef DEFAULT_USER_DIR

#define DEFAULT_USER_DIR        "Library/Web Documents"

#endif

include/httpd.h

+0 −15
Changes for include/httpd.h: 0 added lines, 15 removed lines.
Original line number Diff line number Diff line
@@ -181,16 +181,6 @@ extern "C" { 
#define SERVER_CONFIG_FILE "conf/httpd.conf"

#endif



/* The name of the document config file */

#ifndef RESOURCE_CONFIG_FILE

#define RESOURCE_CONFIG_FILE "conf/srm.conf"

#endif



/* The name of the access file */

#ifndef ACCESS_CONFIG_FILE

#define ACCESS_CONFIG_FILE "conf/access.conf"

#endif



/* Whether we should enable rfc1413 identity checking */

#ifndef DEFAULT_RFC1413

#define DEFAULT_RFC1413 0
@@ -807,11 +797,6 @@ struct server_rec { 
    const char *defn_name;

    unsigned defn_line_number;



    /* Full locations of server config info */



    char *srm_confname;

    char *access_confname;



    /* Contact information */



    char *server_admin;

modules/generators/mod_info.c

+0 −4
Changes for modules/generators/mod_info.c: 0 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -383,10 +383,6 @@ static int display_info(request_rec *r) 
    if (!r->args || strcasecmp(r->args, "list")) {

        cfname = ap_server_root_relative(r->pool, ap_server_confname);

        mod_info_cfg_httpd = mod_info_load_config(r->pool, cfname, r);

        cfname = ap_server_root_relative(r->pool, serv->srm_confname);

        mod_info_cfg_srm = mod_info_load_config(r->pool, cfname, r);

        cfname = ap_server_root_relative(r->pool, serv->access_confname);

        mod_info_cfg_access = mod_info_load_config(r->pool, cfname, r);

        if (!r->args) {

            ap_rputs("<tt><a href=\"#server\">Server Settings</a>, ", r);

            for (modp = top_module; modp; modp = modp->next) {

modules/http/http_core.c

+0 −14
Changes for modules/http/http_core.c: 0 added lines, 14 removed lines.
Original line number Diff line number Diff line
@@ -1767,14 +1767,6 @@ static const char *virtualhost_section(cmd_parms *cmd, void *dummy, char *arg) 
    }

    cmd->end_token = old_end_token;



    if (s->srm_confname) {

	ap_process_resource_config(s, s->srm_confname, p, ptemp);

    }



    if (s->access_confname) {

	ap_process_resource_config(s, s->access_confname, p, ptemp);

    }

    

    if (errmsg == end_virtualhost_section) {

	return NULL;

    }
@@ -2379,12 +2371,6 @@ static const command_rec core_cmds[] = { 
{ "ErrorLog", set_server_string_slot,

  (void *)XtOffsetOf (server_rec, error_fname), RSRC_CONF, TAKE1,

  "The filename of the error log" },

{ "AccessConfig", set_server_string_slot,

  (void *)XtOffsetOf (server_rec, access_confname), RSRC_CONF, TAKE1,

  "The filename of the access config file" },

{ "ResourceConfig", set_server_string_slot,

  (void *)XtOffsetOf (server_rec, srm_confname), RSRC_CONF, TAKE1,

  "The filename of the resource config file" },

{ "ServerAlias", set_server_alias, NULL, RSRC_CONF, RAW_ARGS,

  "A name or names alternately used to access the server" },

{ "ServerPath", set_serverpath, NULL, RSRC_CONF, TAKE1,

server/config.c

+0 −18
Changes for server/config.c: 0 added lines, 18 removed lines.
Original line number Diff line number Diff line
@@ -1031,12 +1031,6 @@ void ap_process_resource_config(server_rec *s, const char *fname, ap_context_t * 


    fname = ap_server_root_relative(p, fname);



    if (!(strcmp(fname, ap_server_root_relative(p, RESOURCE_CONFIG_FILE))) ||

	!(strcmp(fname, ap_server_root_relative(p, ACCESS_CONFIG_FILE)))) {

	if (ap_stat(&finfo, fname, p) != APR_SUCCESS)   

	    return;

    }



    /* don't require conf/httpd.conf if we have a -C or -c switch */

    if((ap_server_pre_read_config->nelts || ap_server_post_read_config->nelts) &&

       !(strcmp(fname, ap_server_root_relative(p, SERVER_CONFIG_FILE)))) {
@@ -1175,8 +1169,6 @@ CORE_EXPORT(const char *) ap_init_virtual_host(ap_context_t *p, const char *host 
    s->server_admin = NULL;

    s->server_hostname = NULL;

    s->error_fname = NULL;

    s->srm_confname = NULL;

    s->access_confname = NULL;

    s->timeout = 0;

    s->keep_alive_timeout = 0;

    s->keep_alive = -1;
@@ -1224,12 +1216,6 @@ static void fixup_virtual_hosts(ap_context_t *p, server_rec *main_server) 
	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)

	    virt->timeout = main_server->timeout;
@@ -1271,8 +1257,6 @@ static server_rec *init_server_config(process_rec *process, ap_context_t *p) 
    s->server_hostname = NULL;

    s->error_fname = DEFAULT_ERRORLOG;

    s->loglevel = DEFAULT_LOGLEVEL;

    s->srm_confname = RESOURCE_CONFIG_FILE;

    s->access_confname = ACCESS_CONFIG_FILE;

    s->limit_req_line = DEFAULT_LIMIT_REQUEST_LINE;

    s->limit_req_fieldsize = DEFAULT_LIMIT_REQUEST_FIELDSIZE;

    s->limit_req_fields = DEFAULT_LIMIT_REQUEST_FIELDS;
@@ -1307,8 +1291,6 @@ server_rec *ap_read_config(process_rec *process, ap_context_t *ptemp, const char 
    process_command_config(s, ap_server_pre_read_config, p, ptemp);



    ap_process_resource_config(s, confname, p, ptemp);

    ap_process_resource_config(s, s->srm_confname, p, ptemp);

    ap_process_resource_config(s, s->access_confname, p, ptemp);



    process_command_config(s, ap_server_post_read_config, p, ptemp);