From: Colm MacCarthaigh <colm@apache.org>
Date: Sat, 4 Feb 2006 18:36:11 +0000 (+0000)
Subject: Make a PR reference consistent and keep the SECURITY changes first.
X-Git-Tag: 2.0.56~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18e7d4f4da79842843ccb53e36f41e04c09285fd;p=thirdparty%2Fapache%2Fhttpd.git

Make a PR reference consistent and keep the SECURITY changes first.


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

diff --git a/CHANGES b/CHANGES
index b7429749b12..93ff5e743b4 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.0.56
 
-  *) Fix PR#38070: Avoid server-driven negotiation when a CGI script
-     has emitted an explicit Status: header [Nick Kew].
-
   *) SECURITY: CVE-2005-3357 (cve.mitre.org)
      mod_ssl: Fix a possible crash during access control checks if a
      non-SSL request is processed for an SSL vhost (such as the
@@ -17,6 +14,9 @@ Changes with Apache 2.0.56
      ap_escape_html so we escape quotes.  Reported by JPCERT.
      [Mark Cox]
 
+  *) Avoid server-driven negotiation when a CGI script has emitted an 
+     explicit "Status:" header. PR 38070.  [Nick Kew]
+
   *) mod_log_config now logs all Set-Cookie headers if the %{Set-Cookie}o
      format is used. PR 27787.  [André Malo]