Backported the UCPP code to 2.2 branch

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

diff --git a/CHANGES b/CHANGES
index a6edfee50489f2856c23960dd26decf0f9fa0169..53ae5535d88c471a4386bf5978c3430d2f1a9d99 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -2,10 +2,6 @@
 Changes with Apache 2.3.0
   [Remove entries to the current 2.0 and 2.2 section below, when backported]
 
-  *) Add in new UseCanonicalPhysicalPort directive, which controls
-     whether or not Apache will ever use the actual physical port
-     when constructing the canonical port number. [Jim Jagielski]
-
   *) Asynchronous write completion for the Event MPM.  [Brian Pane]
 
   *) Added an End-Of-Request bucket type.  The logging of a request and
@@ -37,6 +33,10 @@ Changes with Apache 2.3.0
 
 Changes with Apache 2.1.10
 
+  *) Add in new UseCanonicalPhysicalPort directive, which controls
+     whether or not Apache will ever use the actual physical port
+     when constructing the canonical port number. [Jim Jagielski]
+
   *) mod_dav: Fix a null pointer dereference in an error code path during the
      handling of MKCOL.
      [Ruediger Pluem, Ghassan Misherghi <ghassanm ucdavis.edu>]