From: André Malo <nd@apache.org>
Date: Sat, 13 Mar 2004 21:19:56 +0000 (+0000)
Subject: emit the config filename when warning about overlapping aliases
X-Git-Tag: pre_ajp_proxy~540
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=28b9a3426839756dac88464447f06c29d788ae88;p=apache

emit the config filename when warning about overlapping aliases

Submitted by: Guenter Knauf <eflash gmx.net>
Reviewed by: Dirk-Willem van Gulik


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

diff --git a/modules/mappers/mod_alias.c b/modules/mappers/mod_alias.c
index 2cb4c11ef5..aaf339c2dd 100644
--- a/modules/mappers/mod_alias.c
+++ b/modules/mappers/mod_alias.c
@@ -137,9 +137,11 @@ static const char *add_alias_internal(cmd_parms *cmd, void *dummy,
             if (  (!p->regexp &&  alias_matches(f, p->fake) > 0)
                 || (p->regexp && !ap_regexec(p->regexp, f, 0, NULL, 0))) {
                 ap_log_error(APLOG_MARK, APLOG_WARNING, 0, cmd->server,
-                             "The %s directive at line %d will probably never "
-                             "match because it overlaps an earlier %sAlias%s.",
-                             cmd->cmd->name, cmd->directive->line_num,
+                             "The %s directive in %s at line %d will probably "
+                             "never match because it overlaps an earlier "
+                             "%sAlias%s.",
+                             cmd->cmd->name, cmd->directive->filename,
+                             cmd->directive->line_num,
                              p->handler ? "Script" : "",
                              p->regexp ? "Match" : "");