More 2.2.4-dev syncs

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

diff --git a/CHANGES b/CHANGES
index abce2742aae6e6272d543df499d528b591f6a88d..ad3414b17ad2d7c1b4409aa550cc6ef61f48798a 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -121,12 +121,6 @@ Changes with Apache 2.3.0
      been applied to this cached entity before saving it to the cache are not
      applied again. PR 40090. [Ruediger Pluem]
 
-  *) mod_proxy_ajp: Added cping/cpong support for the AJP protocol.
-     A new worker directive ping=timeout will cause CPING packet
-     to be send expecting CPONG packet within defined timeout.
-     In case the backend is too busy this will fail instead
-     sending the full header.  [Mladen Turk]
-
   *) core: Do not allow internal redirects like the DirectoryIndex of mod_dir
      to circumvent the symbolic link checks imposed by FollowSymLinks and
      SymLinksIfOwnerMatch. [Nick Kew, Ruediger Pluem, William Rowe]
@@ -287,6 +281,12 @@ Changes with Apache 2.2.4
      parameter in the URL correctly. PR 40400.
      [Ruediger Pluem, Tomokazu Harada <harada sysrdc.ns-sol.co.jp>]
 
+  *) mod_proxy_ajp: Added cping/cpong support for the AJP protocol.
+     A new worker directive ping=timeout will cause CPING packet
+     to be send expecting CPONG packet within defined timeout.
+     In case the backend is too busy this will fail instead
+     sending the full header.  [Mladen Turk]
+
   *) mod_cache: From RFC3986 (section 6.2.3.) if a URI contains an
      authority component and an empty path, the empty path is to be equivalent
      to "/". It explicitly cites the following four URIs as equivalents: