Suggestion from André Malo -- use a nested section instead of putting in

[apache] / CHANGES

diff --git a/CHANGES b/CHANGES
index 898ed2e9a114a77d1e7c5143841af5fcc57c48e0..8fbbcba7b4ca084a66c895263a19c7947b4c4158 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,4 +1,40 @@
-                                                         -*- coding: utf-8 -*-
+                                                         -*- coding: utf-8 -*-
+
+Changes with Apache 2.3.10
+
+  *) core: Honor 'AcceptPathInfo OFF' during internal redirects,
+     such as per-directory mod_rewrite substitutions.  PR 50349.
+     [Eric Covener]
+
+  *) mod_rewrite: Add 'RewriteOptions InheritBefore' to put the base 
+     rules/conditions before the overridden rules/conditions.  PR 39313.
+     [Jérôme Grandjanny <jerome.grandjanny cea.fr>]
+
+  *) mod_autoindex: add IndexIgnoreReset to reset the list of IndexIgnored
+     filenames in higher precedence configuration sections.  PR 24243.
+     [Eric Covener]
+
+  *) mod_cgid: RLimit* directive support for mod_cgid.  PR 42135
+     [Eric Covener]
+
+  *) core: Fail startup when the argument to ServerName looks like a glob
+     or a regular expression instead of a hostname (*?[]).  PR 39863 
+     [Rahul Nair <rahul.g.nair gmail.com>]
+
+  *) mod_userdir: Add merging of enable, disable, and filename arguments 
+     to UserDir directive, leaving enable/disable of userlists unmerged. 
+     PR 44076 [Eric Covener]
+
+  *) httpd: When no -k option is provided on the httpd command line, the server
+     was starting without checking for an existing pidfile.  PR 50350 
+     [Eric Covener] 
+ 
+  *) mod_proxy: Put the worker in error state if the SSL handshake with the
+     backend fails. PR 50332.
+     [Daniel Ruggeri <DRuggeri primary.net>, Ruediger Pluem]
+
+  *) mod_cache_disk: Fix Windows build which was broken after renaming
+     the module. [Gregg L. Smith]
 
 Changes with Apache 2.3.9
 
@@ -6,6 +42,16 @@ Changes with Apache 2.3.9
      Fix a denial of service attack against mod_reqtimeout.
      [Stefan Fritsch]
 
+  *) mod_include: Add the onerror attribute to the include element,
+     allowing an URL to be specified to include on error. [Graham
+     Leggett]
+
+  *) mod_cache_disk: mod_disk_cache renamed to mod_cache_disk, to be
+     consistent with the naming of other modules. [Graham Leggett]
+
+  *) mod_setenvif: Add SetEnvIfExpr directive to set env var depending on
+     expression. [Stefan Fritsch]
+
   *) mod_proxy: Fix ProxyPassInterpolateEnv directive. PR 50292.
      [Stefan Fritsch]