* Sync with 2.2.x CHANGES

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

diff --git a/CHANGES b/CHANGES
index e8e4843f6ad2e7dedf1c439665b3395d60551c76..8166beffa54452169d7ec79bd110092f375ced3c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -38,9 +38,6 @@ Changes with Apache 2.3.0
      completely backwards compatible and passes the perl-framework.  Minor
      mmn bump because I add a field to server_rec.  [Sander Temme]     
 
-  *) mod_mem_cache: Set content type correctly when delivering data from
-     cache. PR 39266. [Ruediger Pluem]
-
   *) worker and event MPMs: fix excessive forking if fork() or child_init 
      take a long time.  PR 39275.
      [Greg Ames, Jeff Trawick, Chris Darroch <chrisd pearsoncmg.com> ]
@@ -58,9 +55,6 @@ Changes with Apache 2.3.0
   *) mod_ssl: Fix spurious hostname mismatch warning for valid
      wildcard certificates.  PR 37911.  [Nick Burch <nick torchbox.com>]
 
-  *) Respect GracefulShutdownTimeout in the worker and event MPMs.
-     [Chris Darroch <chrisd pearsoncmg.com>, Garrett Rooney]
-
   *) Authz: Add the new module mod_authn_core that will provide common
      authn directives such as 'AuthType', 'AuthName'.  Move the directives
      'AuthType' and 'AuthName' out of the core module and merge mod_authz_alias 
@@ -125,6 +119,17 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.2.3
 
+  *) Respect GracefulShutdownTimeout in the worker and event MPMs.
+     [Chris Darroch, Garrett Rooney]
+
+  *) mod_mem_cache: Set content type correctly when delivering data from
+     cache. PR 39266. [Ruediger Pluem]
+
+  *) mod_autoindex: Fix filename escaping with FancyIndexing disabled.
+     PR 38910.  [Robby Griffin <rmg terc.edu>]
+
+  *) mod_charset_lite: Bypass translation when the source and dest charsets
+     are the same. [Jeff Trawick]
 
 Changes with Apache 2.2.2