Commit 7f812822 authored by Ruediger Pluem's avatar Ruediger Pluem
Browse files

* 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
parent 5d8e6f8e

CHANGES

+4 −0
Original line number Diff line number Diff line
@@ -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>]

































server/core.c



+2
−2






























Original line number
Diff line number
Diff line








@@ -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;