From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 17 May 2002 19:34:52 +0000 (+0000)
Subject:   We need to grab ServerRoot, LogLevel, and ErrorLog right off the bat
X-Git-Tag: 2.0.37~349
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=eb3ac00c5f6f1efcf663fa3c0428eb959f1f62cd;p=thirdparty%2Fapache%2Fhttpd.git

  We need to grab ServerRoot, LogLevel, and ErrorLog right off the bat
  as we are reading the config.

  This closes a bug where ServerRoot /foo + LoadModule relative/mod_foo.so
  won't load mod_foo.so.

Reported by: Ron Leung <rleung@covalent.net>


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

diff --git a/server/core.c b/server/core.c
index 82cd3e28b30..82894eeca26 100644
--- a/server/core.c
+++ b/server/core.c
@@ -2918,10 +2918,10 @@ AP_INIT_TAKE1("ServerName", server_hostname_port, NULL, RSRC_CONF,
   "The hostname and port of the server"),
 AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL,
   "En-/disable server signature (on|off|email)"),
-AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF,
+AP_INIT_TAKE1("ServerRoot", set_server_root, NULL, RSRC_CONF | EXEC_ON_READ,
   "Common directory of server-related files (logs, confs, etc.)"),
 AP_INIT_TAKE1("ErrorLog", set_server_string_slot,
-  (void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF,
+  (void *)APR_XtOffsetOf (server_rec, error_fname), RSRC_CONF | EXEC_ON_READ,
   "The filename of the error log"),
 AP_INIT_RAW_ARGS("ServerAlias", set_server_alias, NULL, RSRC_CONF,
   "A name or names alternately used to access the server"),
@@ -2941,7 +2941,7 @@ AP_INIT_TAKE1("UseCanonicalName", set_use_canonical_name, NULL,
 AP_INIT_TAKE1("Include", include_config, NULL,
   (RSRC_CONF | ACCESS_CONF | EXEC_ON_READ),
   "Name of the config file to be included"),
-AP_INIT_TAKE1("LogLevel", set_loglevel, NULL, RSRC_CONF,
+AP_INIT_TAKE1("LogLevel", set_loglevel, NULL, RSRC_CONF | EXEC_ON_READ,
   "Level of verbosity in error logging"),
 AP_INIT_TAKE1("NameVirtualHost", ap_set_name_virtual_host, NULL, RSRC_CONF,
   "A numeric IP address:port, or the name of a host"),