Merge r420307 from trunk:

* 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, jim, pquerna

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@662566 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ceeea727a393710ce336dcc8a94a14d51cdb9c33..d778816d12454228c1832cee2f7fdcec4e12f9c4 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,10 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.9
 
+  *) 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>]
+
   *) scoreboard: Remove unused proxy load balancer elements from scoreboard
      image (not scoreboard memory itself).  [Chris Darroch]
 

diff --git a/server/core.c b/server/core.c
index 52fcc4e469a457efb0520814ba7f11c7dd578a6b..3b1b01b7d315ddf63544d9a2f7f0ec370f0f6eb0 100644 (file)
--- a/server/core.c
+++ b/server/core.c
@@ -1356,8 +1356,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;