httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From n.@apache.org
Subject cvs commit: httpd-2.0/modules/mappers mod_alias.c
Date Sat, 13 Mar 2004 21:19:56 GMT
nd          2004/03/13 13:19:56

  Modified:    modules/mappers mod_alias.c
  Log:
  emit the config filename when warning about overlapping aliases
  
  Submitted by: Guenter Knauf <eflash gmx.net>
  Reviewed by: Dirk-Willem van Gulik
  
  Revision  Changes    Path
  1.55      +5 -3      httpd-2.0/modules/mappers/mod_alias.c
  
  Index: mod_alias.c
  ===================================================================
  RCS file: /home/cvs/httpd-2.0/modules/mappers/mod_alias.c,v
  retrieving revision 1.54
  retrieving revision 1.55
  diff -u -u -r1.54 -r1.55
  --- mod_alias.c	9 Feb 2004 20:29:20 -0000	1.54
  +++ mod_alias.c	13 Mar 2004 21:19:56 -0000	1.55
  @@ -137,9 +137,11 @@
               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" : "");
   
  
  
  

Mime
View raw message