From: André Malo <nd@apache.org>
Date: Mon, 14 Jun 2004 22:11:25 +0000 (+0000)
Subject: sync
X-Git-Tag: pre_ajp_proxy~150
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e8b054fc5172a5211388c2934f0bef86917b6f8f;p=thirdparty%2Fapache%2Fhttpd.git

sync


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

diff --git a/CHANGES b/CHANGES
index 7343480a49a..6de7f9aeaa7 100644
--- a/CHANGES
+++ b/CHANGES
@@ -376,6 +376,9 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.50
 
+  *) mod_alias now emits a warning if it detects overlapping *Alias*
+     directives.  [André Malo]
+
   *) mod_rewrite no longer turns forward proxy requests into reverse proxy
      requests. PR 28125  [ast domdv.de, André Malo]