From: Joe Orton <jorton@apache.org>
Date: Fri, 20 Jul 2007 12:24:35 +0000 (+0000)
Subject: Add reference to PR 39710 fix, move non-security fix down.
X-Git-Tag: 2.2.5~125
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4b437750197322dbba74e9f19d447b8a437610a;p=thirdparty%2Fapache%2Fhttpd.git

Add reference to PR 39710 fix, move non-security fix down.


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

diff --git a/CHANGES b/CHANGES
index b5e6d1d5f24..fc4f0b36c5e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.5
 
-  *) mod_proxy: Fix the 503 returned when session route does
-     not match any of the balancer members. [Mladen Turk]
-
   *) SECURITY: CVE-2007-1863 (cve.mitre.org)
      mod_cache: Prevent a segmentation fault if attributes are listed in a 
      Cache-Control header without any value. 
@@ -24,6 +21,12 @@ Changes with Apache 2.2.5
      values could previously point to cleaned up storage.  PR 41551.
      [Davi Arnaut <davi haxent.com.br>]
 
+  *) mod_cgi, mod_cgid: Fix use of CGI scripts as ErrorDocuments.
+     PR 39710.  [Paul Querna, Ruediger Pluem]
+
+  *) mod_proxy: Fix the 503 returned when session route does
+     not match any of the balancer members. [Mladen Turk]
+
   *) mod_proxy: Added ProxyPassMatch directive, which is similar
      to ProxyPass but takes a regex local path prefix. [Jim Jagielski]