From: Ruediger Pluem <rpluem@apache.org>
Date: Sun, 9 Jul 2006 16:19:41 +0000 (+0000)
Subject: * Add the filename of the configuration file to the warning message
X-Git-Tag: 2.3.0~2279
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c93a4faef9c1db845cbdc6a5d2a6e32735ceda2c;p=thirdparty%2Fapache%2Fhttpd.git

* Add the filename of the configuration file to the warning message
  about the useless use of AllowOverride.

PR: 39992
Submitted by: Darryl Miles <darryl darrylmiles.org>
Reviewed by: rpluem


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

diff --git a/CHANGES b/CHANGES
index 00873f83011..d46083b99a0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -2,6 +2,10 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
+  *) core: Add the filename of the configuration file to the warning message
+     about the useless use of AllowOverride. PR 39992.
+     [Darryl Miles <darryl darrylmiles.org>]
+
   *) mod_proxy_balancer: Retry worker chosen by route / redirect worker if
      it is in error state before sending "Service Temporarily Unavailable".
      PR 38962. [Christian Boitel <cboitel lfdj.com>]
diff --git a/server/core.c b/server/core.c
index 8c492f103b4..ce033c954f3 100644
--- a/server/core.c
+++ b/server/core.c
@@ -1315,8 +1315,8 @@ static const char *set_override(cmd_parms *cmd, void *d_, const char *l)
     /* Throw a warning if we're in <Location> or <Files> */
     if (ap_check_cmd_context(cmd, NOT_IN_LOCATION | NOT_IN_FILES)) {
         ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
-                     "Useless use of AllowOverride in line %d.",
-                     cmd->directive->line_num);
+                     "Useless use of AllowOverride in line %d of %s.",
+                     cmd->directive->line_num, cmd->directive->filename);
     }
 
     d->override = OR_NONE;