From b0042289dd9c5fd4e2e2cdfa0b6b7f72ddb3b34b Mon Sep 17 00:00:00 2001 From: "William A. Rowe Jr" Date: Sat, 18 May 2002 16:35:57 +0000 Subject: [PATCH] Although it appears reasonable to immediately gather the Error log and level from the config; these are per-vhost entities that can't be processed as we preload the config tree. There is more work to do, as Cliff Woolley guesses, before we can make this change. In the meantime, -e and -E should provide the admin sufficient options to work around problematic configs. So I'm reverting those changes, for now. ServerRoot is global only, and it MUST be read immediately, so that part of the last patch stays. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@95170 13f79535-47bb-0310-9956-ffa450edef68 --- server/core.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/server/core.c b/server/core.c index 389977056f..9884a3f209 100644 --- a/server/core.c +++ b/server/core.c @@ -2921,7 +2921,7 @@ AP_INIT_TAKE1("ServerSignature", set_signature_flag, NULL, OR_ALL, 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_OFFSETOF(server_rec, error_fname), RSRC_CONF | EXEC_ON_READ, + (void *)APR_OFFSETOF(server_rec, error_fname), RSRC_CONF, "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 | EXEC_ON_READ, +AP_INIT_TAKE1("LogLevel", set_loglevel, NULL, RSRC_CONF, "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"), -- 2.40.0