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 1e058cab5c44c7c8126124116706e00d2338f8bd..b128c086ec1a32161585fc31c08845d05ede76ab 100644 (file)
--- 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 830a93261572864b8f44d5f2dfde87e80ef1c77a..1a59b1697d66ea1a079083296a51a602473e3dc8 100644 (file)
--- 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