From: Eric Covener <covener@apache.org>
Date: Sat, 4 Dec 2010 03:48:49 +0000 (+0000)
Subject: propose a simple mod_userdir backport for PR44076
X-Git-Tag: 2.2.18~266
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c642507dde4900dfa673de4d6cf6bb5dc757a42b;p=thirdparty%2Fapache%2Fhttpd.git

propose a simple mod_userdir backport for PR44076



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

diff --git a/STATUS b/STATUS
index 35c7999f6d0..991ea8ca3ad 100644
--- a/STATUS
+++ b/STATUS
@@ -191,6 +191,12 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-proxy_connect_eintr.diff
      +1 covener, trawick
 
+   * mod_userdir: support merge of "userdir disabled" or "userdir public_html"
+     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
+  
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of