From: Daniel Earl Poirier <poirier@apache.org>
Date: Mon, 7 Feb 2011 18:05:51 +0000 (+0000)
Subject: Vote to fix merge of server config for mod_userdir
X-Git-Tag: 2.2.18~160
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=587bf6e4a66fa383971056f036a5329c8ffbb1aa;p=thirdparty%2Fapache%2Fhttpd.git

Vote to fix merge of server config for mod_userdir

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

diff --git a/STATUS b/STATUS
index ee09ca73b8f..1b73b13ed14 100644
--- a/STATUS
+++ b/STATUS
@@ -211,7 +211,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      when userdir directives appear in vhost context. PR 44076
      Trunk patch: http://svn.apache.org/viewvc?rev=1042090&view=rev
      2.2.x patch:  http://people.apache.org/~covener/patches/2.2.x-userdir_merge.diff 
-     +1 covener, rpluem
+     +1 covener, rpluem, poirier
 
    * mod_proxy_http: Become aware of ssl handshake failures when attempting
      to pass request. Makes it so workers are put in error state when a