Userland changes

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@713148 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index ef850e5dac3814dfaacfc98dc7dbda1dfeac9fec..64a267164094b63398c26d6f5eaacb293cb42f75 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,15 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.11
 
-  *) mod_proxy: Prevent segmentation faults by correctly adjusting the lifetime
-     of the buckets read from the proxy backend. PR 45792 [Ruediger Pluem]
+  *) mod_proxy: Prevent segmentation faults by correctly adjusting the
+     lifetime of the buckets read from the proxy backend. PR 45792
+     [Ruediger Pluem]
+
+  *) mod_expires: Do not sets negative max-age / Expires header in the past.
+     PR 39774 [Jim Jagielski]
+
+  *) mod_info: Was displaying the wrong value for the KeepAliveTimeout
+     value. [Jim Jagielski]
 
   *) mod_proxy_ajp: Fix wrongly formatted requests where client
      sets Content-Length header, but doesn't provide a body.