httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r1225198 - /httpd/httpd/trunk/server/core.c
Date Wed, 28 Dec 2011 14:50:44 GMT
Author: sf
Date: Wed Dec 28 14:50:44 2011
New Revision: 1225198

URL: http://svn.apache.org/viewvc?rev=1225198&view=rev
Log:
Fix -DDUMP_RUN_CFG output for piped and syslog loggers


Modified:
    httpd/httpd/trunk/server/core.c

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=1225198&r1=1225197&r2=1225198&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Wed Dec 28 14:50:44 2011
@@ -4683,7 +4683,7 @@ static void core_dump_config(apr_pool_t 
 {
     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 
     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 
         else
             apr_file_printf(out, "Define: %s\n", name);
     }
-
 }
 
 static void register_hooks(apr_pool_t *p)



Mime
View raw message