httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@locus.apache.org
Subject cvs commit: apache-2.0/src/modules/standard mod_info.c
Date Wed, 15 Mar 2000 23:18:32 GMT
manoj       00/03/15 15:18:32

  Modified:    src      apaci.in
               src/include ap_config.h httpd.h
               src/main http_config.c http_core.c http_main.c
               src/modules/standard mod_info.c
  Log:
  Eliminate implicit usage of access.conf and srm.conf.
  
  Revision  Changes    Path
  1.2       +0 -2      apache-2.0/src/apaci.in
  
  Index: apaci.in
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/apaci.in,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- apaci.in	2000/02/09 01:33:26	1.1
  +++ apaci.in	2000/03/15 23:18:30	1.2
  @@ -11,5 +11,3 @@
   echo '-DDEFAULT_ERRORLOG="logs/error_log"'
   echo '-DTYPES_CONFIG_FILE="conf/mime.types"'
   echo '-DSERVER_CONFIG_FILE="conf/httpd.conf"'
  -echo '-DACCESS_CONFIG_FILE="conf/access.conf"'
  -echo '-DRESOURCE_CONFIG_FILE="conf/srm.conf"'
  
  
  
  1.16      +0 -6      apache-2.0/src/include/ap_config.h
  
  Index: ap_config.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/ap_config.h,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ap_config.h	2000/03/10 00:05:50	1.15
  +++ ap_config.h	2000/03/15 23:18:30	1.16
  @@ -476,14 +476,8 @@
   #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"
  
  
  
  1.31      +0 -15     apache-2.0/src/include/httpd.h
  
  Index: httpd.h
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/include/httpd.h,v
  retrieving revision 1.30
  retrieving revision 1.31
  diff -u -r1.30 -r1.31
  --- httpd.h	2000/03/14 14:09:52	1.30
  +++ httpd.h	2000/03/15 23:18:30	1.31
  @@ -181,16 +181,6 @@
   #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
  @@ -806,11 +796,6 @@
       /* description of where the definition came from */
       const char *defn_name;
       unsigned defn_line_number;
  -
  -    /* Full locations of server config info */
  -
  -    char *srm_confname;
  -    char *access_confname;
   
       /* Contact information */
   
  
  
  
  1.28      +0 -18     apache-2.0/src/main/http_config.c
  
  Index: http_config.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_config.c,v
  retrieving revision 1.27
  retrieving revision 1.28
  diff -u -r1.27 -r1.28
  --- http_config.c	2000/03/14 14:09:52	1.27
  +++ http_config.c	2000/03/15 23:18:31	1.28
  @@ -1031,12 +1031,6 @@
   
       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 @@
       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 @@
   	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 @@
       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 @@
       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);
   
  
  
  
  1.39      +0 -14     apache-2.0/src/main/http_core.c
  
  Index: http_core.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_core.c,v
  retrieving revision 1.38
  retrieving revision 1.39
  diff -u -r1.38 -r1.39
  --- http_core.c	2000/03/14 19:29:40	1.38
  +++ http_core.c	2000/03/15 23:18:31	1.39
  @@ -1767,14 +1767,6 @@
       }
       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 @@
   { "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,
  
  
  
  1.34      +0 -6      apache-2.0/src/main/http_main.c
  
  Index: http_main.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/main/http_main.c,v
  retrieving revision 1.33
  retrieving revision 1.34
  diff -u -r1.33 -r1.34
  --- http_main.c	2000/03/14 22:06:47	1.33
  +++ http_main.c	2000/03/15 23:18:31	1.34
  @@ -191,12 +191,6 @@
   #ifdef SERVER_CONFIG_FILE
       printf(" -D SERVER_CONFIG_FILE=\"" SERVER_CONFIG_FILE "\"\n");
   #endif
  -#ifdef ACCESS_CONFIG_FILE
  -    printf(" -D ACCESS_CONFIG_FILE=\"" ACCESS_CONFIG_FILE "\"\n");
  -#endif
  -#ifdef RESOURCE_CONFIG_FILE
  -    printf(" -D RESOURCE_CONFIG_FILE=\"" RESOURCE_CONFIG_FILE "\"\n");
  -#endif
   }
   
   static void destroy_and_exit_process(process_rec *process, int process_exit_value)
  
  
  
  1.8       +0 -4      apache-2.0/src/modules/standard/mod_info.c
  
  Index: mod_info.c
  ===================================================================
  RCS file: /home/cvs/apache-2.0/src/modules/standard/mod_info.c,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- mod_info.c	2000/03/10 00:07:12	1.7
  +++ mod_info.c	2000/03/15 23:18:32	1.8
  @@ -383,10 +383,6 @@
       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) {
  
  
  

Mime
View raw message