From: Jeff Trawick <trawick@apache.org>
Date: Fri, 6 Aug 2010 18:06:40 +0000 (+0000)
Subject: vote+promote
X-Git-Tag: 2.2.17~96
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3da84b91511353b1d49533557ed6672905f6c7fb;p=thirdparty%2Fapache%2Fhttpd.git

vote+promote


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

diff --git a/STATUS b/STATUS
index a080544eed0..a8922b41a4d 100644
--- a/STATUS
+++ b/STATUS
@@ -93,6 +93,12 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
      2.2.x: trunk patch works with offset
      +1: niq, rpluem, sf
 
+   * mod_ssl: use memmove instead of memcpy for overlapping buffers
+     PR 45444
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=683280
+     2.2 patch: trunk patch works with offset
+     +1: sf, rpluem, trawick
+
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]
 
@@ -244,12 +250,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2 patch: should apply cleanly
      +1: gstein
 
-   * mod_ssl: use memmove instead of memcpy for overlapping buffers
-     PR 45444
-     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=683280
-     2.2 patch: trunk patch works with offset
-     +1: sf, rpluem
-
    * mod_proxy_scgi: Add module to build on Windows.
      It already gets build for other platforms and for Windows in trunk.
      2.2 patch: http://people.apache.org/~rjung/patches/mod_proxy_scgi-win-build-2_2.patch