Merge r1667676, r1826207 from trunk:

[apache] / CHANGES

diff --git a/CHANGES b/CHANGES
index 09923968b58f3f1ff9167afa52cc937c47c3396f..3ae7d27d8f50fb638a70ff7a5855482294f95ebb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,13 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.4.32
 
+  *) mod_access_compat: Fail if a comment is found in an Allow or Deny
+     directive.  [Jan Kaluza]
+
+  *) mod_authz_host: Ignore comments after "Require host", logging a
+     warning, or logging an error if the line is otherwise empty.
+     [Jan Kaluza, Joe Orton]
+
   *) rotatelogs: Fix expansion of %Z in localtime (-l) mode, and fix
      Y2K38 bug.  [Joe Orton]