From bb616ddda3c8e1ec73d906f046d207eac1f7c261 Mon Sep 17 00:00:00 2001 From: Stefan Fritsch Date: Fri, 5 Feb 2010 17:38:08 +0000 Subject: [PATCH] Print directive name in error message. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907012 13f79535-47bb-0310-9956-ffa450edef68 --- modules/debugging/mod_dumpio.c | 2 +- server/core.c | 2 +- server/log.c | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c index 209be72ff0..6508966941 100644 --- a/modules/debugging/mod_dumpio.c +++ b/modules/debugging/mod_dumpio.c @@ -246,7 +246,7 @@ static const char *set_loglevel(cmd_parms *cmd, void *dummy, const char *arg) if ((str = ap_getword_conf(cmd->pool, &arg))) { err = ap_parse_log_level(str, &ptr->loglevel); if (err != NULL) - return err; + return apr_psprintf(cmd->pool, "DumpIOLogLevel: %s", err); } else { return "DumpIOLogLevel requires level keyword"; diff --git a/server/core.c b/server/core.c index 35d472a74f..df0cdf12b5 100644 --- a/server/core.c +++ b/server/core.c @@ -2628,7 +2628,7 @@ static const char *set_loglevel(cmd_parms *cmd, void *dummy, const char *arg) if ((str = ap_getword_conf(cmd->pool, &arg))) { err = ap_parse_log_level(str, &cmd->server->loglevel); if (err != NULL) - return err; + return apr_psprintf(cmd->pool, "LogLevel: %s", err); } else { return "LogLevel requires level keyword"; diff --git a/server/log.c b/server/log.c index c3abd5a8d4..a0c6995c53 100644 --- a/server/log.c +++ b/server/log.c @@ -1129,7 +1129,7 @@ AP_DECLARE(void) ap_close_piped_log(piped_log *pl) AP_DECLARE(const char *) ap_parse_log_level(const char *str, int *val) { - char *err = "Loglevel keyword must be one of emerg/alert/crit/error/warn/" + char *err = "Log level keyword must be one of emerg/alert/crit/error/warn/" "notice/info/debug"; int i = 0; -- 2.40.0