Refresh patch for 2.2.x and reset votes.

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

diff --git a/STATUS b/STATUS
index f356408ee940e2d41c6ed40d534d2741b034624f..d7407d20b78f6647b51b166aa74e2dbed09c3c18 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -270,10 +270,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
    * mod_ssl: Don't use the pconf pool for allocating memory pointed by
      a local static variable. PR 43865.
+     trunk:
          http://svn.apache.org/viewvc?view=rev&revision=591384
+     2.2.x:
+        Trunk patch has a simple conflict due to name change of
+        a optional function variable, refreshed patch:
+        http://people.apache.org/~davi/ssl_engine_var_safe.patch
      +1: davi
-     -1: rpluem says: There are two conflicts when merging ssl_engine_vars.c.
-         One is caused by r289444 and the other one is unknown.
 
 PATCHES/ISSUES THAT ARE STALLED