www/apache
1
0
Fork 0
mirror of https://github.com/apache/httpd.git synced 2026-01-06 09:01:14 +03:00
Code Activity

Fix -DDUMP_RUN_CFG output for piped and syslog loggers

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225198 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Stefan Fritsch
2011-12-28 14:50:44 +00:00
parent 2ea507b5a3
commit 70cfa8d396
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server/core.c
View File

@@ -4683,7 +4683,7 @@ static void core_dump_config(apr_pool_t *p, server_rec *s)
{
core_server_config *sconf = ap_get_core_module_config(s->module_config);
apr_file_t *out = NULL;
char *tmp;
const char *tmp;
const char **defines;
int i;
if (!ap_exists_config_define("DUMP_RUN_CFG"))
@@ -4693,7 +4693,10 @@ static void core_dump_config(apr_pool_t *p, server_rec *s)
apr_file_printf(out, "ServerRoot: \"%s\"\n", ap_server_root);
tmp = ap_server_root_relative(p, sconf->ap_document_root);
apr_file_printf(out, "Main DocumentRoot: \"%s\"\n", tmp);
tmp = ap_server_root_relative(p, s->error_fname);
if (s->error_fname[0] != '|' && strcmp(s->error_fname, "syslog") != 0)
tmp = ap_server_root_relative(p, s->error_fname);
else
tmp = s->error_fname;
apr_file_printf(out, "Main ErrorLog: \"%s\"\n", tmp);
if (ap_scoreboard_fname) {
tmp = ap_server_root_relative(p, ap_scoreboard_fname);
@@ -4713,7 +4716,6 @@ static void core_dump_config(apr_pool_t *p, server_rec *s)
else
apr_file_printf(out, "Define: %s\n", name);
}
}
static void register_hooks(apr_pool_t *p)