From: Ruediger Pluem <rpluem@apache.org>
Date: Mon, 20 Jul 2009 13:48:42 +0000 (+0000)
Subject: * SECURITY first and remove BOM.
X-Git-Tag: 2.2.12~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=11e7a08cd2d037e7d2d4223418d8a6d120439db3;p=thirdparty%2Fapache%2Fhttpd.git

* SECURITY first and remove BOM.


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

diff --git a/CHANGES b/CHANGES
index c9c5c7cd99d..c6a4d034ebc 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,9 +1,6 @@
-                                                         -*- coding: utf-8 -*-
+                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.12
 
-  *) mod_include: fix potential segfault when handling back references
-     on an empty SSI variable. [Ruediger Pluem, Lars Eilebrecht, Nick Kew]
-
   *) SECURITY: CVE-2009-1891 (cve.mitre.org)
      Fix a potential Denial-of-Service attack against mod_deflate or other 
      modules, by forcing the server to consume CPU time in compressing a 
@@ -30,6 +27,9 @@ Changes with Apache 2.2.12
      different security issues which may affect particular configurations
      and third-party modules.
 
+  *) mod_include: fix potential segfault when handling back references
+     on an empty SSI variable. [Ruediger Pluem, Lars Eilebrecht, Nick Kew]
+
   *) mod_alias: check sanity in Redirect arguments.
      PR 44729 [Sönke Tesch <st kino-fahrplan.de>, Jim Jagielski]