svn commit: r662566 - in /httpd/httpd/branches/2.2.x: CHANGES server/core.c

[rp...@apache.org]

Author: rpluem
Date: Mon Jun  2 14:18:18 2008
New Revision: 662566

URL: http://svn.apache.org/viewvc?rev=662566&view=rev
Log:
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

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/server/core.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=662566&r1=662565&r2=662566&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Mon Jun  2 14:18:18 2008
@@ -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]
 

Modified: httpd/httpd/branches/2.2.x/server/core.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/server/core.c?rev=662566&r1=662565&r2=662566&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/server/core.c (original)
+++ httpd/httpd/branches/2.2.x/server/core.c Mon Jun  2 14:18:18 2008
@@ -1356,8 +1356,8 @@
     /* 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;