From: Nick Kew <niq@apache.org>
Date: Mon, 6 Aug 2007 18:35:35 +0000 (+0000)
Subject: Vote.  And rearrange credits to put Davi rightfully first in the
X-Git-Tag: 2.2.5~31
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=aa978793dac94e89062aafd67e545321fb000e55;p=thirdparty%2Fapache%2Fhttpd.git

Vote.  And rearrange credits to put Davi rightfully first in the
proxy date fix.


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

diff --git a/CHANGES b/CHANGES
index 1e058cab5c4..b128c086ec1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -4,8 +4,8 @@ Changes with Apache 2.2.5
   *) SECURITY: CVE-2007-3847 (cve.mitre.org)
      mod_proxy: Prevent reading past the end of a buffer when parsing
      date-related headers.  PR 41144.
-     [Nick Kew, Davi Arnaut]
-    
+     [Davi Arnaut, Nick Kew]
+
   *) 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. 
diff --git a/STATUS b/STATUS
index 830a9326157..1a59b1697d6 100644
--- a/STATUS
+++ b/STATUS
@@ -340,7 +340,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
          http://svn.apache.org/viewcvs.cgi?rev=562860&view=rev
       Backport version for 2.2.x of patch:
          Trunk version of patch works
-      +1: rpluem
+      +1: rpluem, niq
 
 
 PATCHES/ISSUES THAT ARE STALLED