Synch with 2.0 branch.

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

diff --git a/CHANGES b/CHANGES
index a7dc0e6c19356d277d685b31da22945f0056bfe0..a13b5dd24f44afddb6dcb629787b015e4d86021c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -28,15 +28,9 @@ Changes with Apache 2.1.0-dev
      true if the pattern is a file with execution permissions.
      [André Malo]
 
-  *) mod_ssl: Fix streaming output from an nph- CGI script. PR 21944
-     [Joe Orton]
-
   *) mod_log_config: Fix corruption of buffered logs with threaded
      MPMs.  PR 25520.  [Jeff Trawick]
 
-  *) Build array of allowed methods with proper dimensions, fixing
-     possible memory corruption.  [Jeff Trawick]
-
   *) Allow proxying of resources that are invoked via DirectoryIndex.
      PR 14648.  [André Malo]
 
@@ -285,6 +279,18 @@ Changes with Apache 2.1.0-dev
 
 Changes with Apache 2.0.49
 
+  *) mod_dav: Reject requests which include an unescaped fragment in the
+     Request-URI.  PR 21779.  [Amit Athavale <amit_athavale lycos.com>]
+
+  *) Build array of allowed methods with proper dimensions, fixing
+     possible memory corruption.  [Jeff Trawick]
+
+  *) mod_ssl: Fix potential segfault on lookup of SSL_SESSION_ID.
+     PR 15057.  [Otmar Lendl <lendl nic.at>]
+
+  *) mod_ssl: Fix streaming output from an nph- CGI script. PR 21944
+     [Joe Orton]
+
   *) mod_usertrack no longer inspects the Cookie2 header for
      the cookie name. PR 11475.  [Chris Darrochi <chrisd pearsoncmg.com>]