Print directive name in error message.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@907012 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/modules/debugging/mod_dumpio.c b/modules/debugging/mod_dumpio.c
index 209be72ff042e5fdbe1cdad632ef59b6a0d8d792..65089669413a264943cd08b0099fd6b8ed549b95 100644 (file)
--- 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 35d472a74f370b9d0fea1ec556cb4f62f771f2cf..df0cdf12b5fceb0924e39e65c2c46f81abfa1cb2 100644 (file)
--- 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 c3abd5a8d43807d5df0158f8da59e8aa9459972a..a0c6995c5352fff5474172137311205bf9496a57 100644 (file)
--- 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;