httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From s.@apache.org
Subject svn commit: r907012 - in /httpd/httpd/trunk: modules/debugging/mod_dumpio.c server/core.c server/log.c
Date Fri, 05 Feb 2010 17:38:08 GMT
Author: sf
Date: Fri Feb  5 17:38:08 2010
New Revision: 907012

URL: http://svn.apache.org/viewvc?rev=907012&view=rev
Log:
Print directive name in error message.

Modified:
    httpd/httpd/trunk/modules/debugging/mod_dumpio.c
    httpd/httpd/trunk/server/core.c
    httpd/httpd/trunk/server/log.c

Modified: httpd/httpd/trunk/modules/debugging/mod_dumpio.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/debugging/mod_dumpio.c?rev=907012&r1=907011&r2=907012&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/debugging/mod_dumpio.c (original)
+++ httpd/httpd/trunk/modules/debugging/mod_dumpio.c Fri Feb  5 17:38:08 2010
@@ -246,7 +246,7 @@
     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";

Modified: httpd/httpd/trunk/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/core.c?rev=907012&r1=907011&r2=907012&view=diff
==============================================================================
--- httpd/httpd/trunk/server/core.c (original)
+++ httpd/httpd/trunk/server/core.c Fri Feb  5 17:38:08 2010
@@ -2628,7 +2628,7 @@
     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";

Modified: httpd/httpd/trunk/server/log.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/log.c?rev=907012&r1=907011&r2=907012&view=diff
==============================================================================
--- httpd/httpd/trunk/server/log.c (original)
+++ httpd/httpd/trunk/server/log.c Fri Feb  5 17:38:08 2010
@@ -1129,7 +1129,7 @@
 
 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;
 



Mime
View raw message