From: Eric Covener <covener@apache.org>
Date: Fri, 3 Dec 2010 16:08:39 +0000 (+0000)
Subject: propose two short fixes for backport
X-Git-Tag: 2.2.18~275
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a372e7c799982bf03b6dd475d4fe16a13beee02;p=thirdparty%2Fapache%2Fhttpd.git

propose two short fixes for backport


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

diff --git a/STATUS b/STATUS
index 5f27910df60..2442b88e509 100644
--- a/STATUS
+++ b/STATUS
@@ -180,6 +180,18 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      enabling/disabling the basic capability is not split out into mod_unixd 2.2.x.
      +1: trawick
 
+   * autoindex: fix merge of IndexOptions into per-dir configs 
+     without any autoindex options.  PR47766
+     Trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1031430
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-autoindex_merge.diff
+     +1 covener
+    
+   * mod_proxy_connect: don't break proxy connections when EINTR is received 
+     during poll PR50220.
+     Trunk patch: http://svn.apache.org/viewvc?rev=1031551&view=rev
+     2.2.x patch: http://people.apache.org/~covener/patches/2.2.x-proxy_connect_eintr.diff
+     +1 covener
+
 PATCHES/ISSUES THAT ARE STALLED
 
   * core: Support wildcards in both the directory and file components of