diff options
| author | Manoj Kasichainula <manoj@apache.org> | 2000-03-16 00:18:32 +0100 |
|---|---|---|
| committer | Manoj Kasichainula <manoj@apache.org> | 2000-03-16 00:18:32 +0100 |
| commit | ad3cb5512812de969f2c1fc148b6a7de21da8c9e (patch) | |
| tree | cbbd0a90cd060cb3ddad6da703a88bcce5e6a8d4 /include | |
| parent | Minor nit: use top_srcdir instead of topsrcdir, to be more consistent (diff) | |
| download | apache2-ad3cb5512812de969f2c1fc148b6a7de21da8c9e.tar.xz apache2-ad3cb5512812de969f2c1fc148b6a7de21da8c9e.zip | |
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
Diffstat (limited to 'include')
| -rw-r--r-- | include/ap_config.h | 6 | ||||
| -rw-r--r-- | include/httpd.h | 15 |
2 files changed, 0 insertions, 21 deletions
diff --git a/include/ap_config.h b/include/ap_config.h index 01afae5c70..cd356e2168 100644 --- a/include/ap_config.h +++ b/include/ap_config.h @@ -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 diff --git a/include/httpd.h b/include/httpd.h index 23eef47205..614517684b 100644 --- a/include/httpd.h +++ b/include/httpd.h @@ -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; |