From: William A. Rowe Jr <wrowe@apache.org>
Date: Fri, 11 Jun 2010 21:04:46 +0000 (+0000)
Subject: This should wrap up our documentation
X-Git-Tag: 2.2.16~51
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=04d8010158c84314cc8a37d92427f5f7b9531d90;p=thirdparty%2Fapache%2Fhttpd.git

This should wrap up our documentation

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

diff --git a/CHANGES b/CHANGES
index ed23d5122c8..373db40a9d3 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,8 +1,9 @@
                                                          -*- coding: utf-8 -*-
 Changes with Apache 2.2.16
 
-  *) mod_proxy_ajp, mod_proxy_http, mod_reqtimeout: Fix timeout detection
-     for platforms Windows, Netware and OS2. [Rainer Jung]
+  *) SECURITY: CVE-2010-2068 (cve.mitre.org)
+     mod_proxy_ajp, mod_proxy_http, mod_reqtimeout: Fix timeout detection
+     for platforms Windows, Netware and OS2.  PR: 49417. [Rainer Jung]
 
   *) mod_ssl: Fix segfault at startup if proxy client certs are shared
      across multiple vhosts.  PR 39915.  [Joe Orton]