From 70cfa8d396c3cd7fdc9c84daeedbab1868faa160 Mon Sep 17 00:00:00 2001
From: Stefan Fritsch <sf@apache.org>
Date: Wed, 28 Dec 2011 14:50:44 +0000
Subject: [PATCH] Fix -DDUMP_RUN_CFG output for piped and syslog loggers
git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1225198 13f79535-47bb-0310-9956-ffa450edef68
---
server/core.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/server/core.c b/server/core.c
index c1f472cf4f..c4ad3ff44a 100644
--- a/server/core.c
+++ b/server/core.c
@@ -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)
--
2.40.0