From: Stefan Eissing Date: Mon, 26 Nov 2018 10:17:16 +0000 (+0000) Subject: votes X-Git-Tag: 2.4.38~61 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=03399dc06f3a7426bdde000792da8242800f1a42;p=thirdparty%2Fapache%2Fhttpd.git votes git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1847457 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 9f5695e088b..4865997194b 100644 --- a/STATUS +++ b/STATUS @@ -183,7 +183,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: *) mod_rewrite: Only create the rewritelock when needed. PR 62311 trunk patch: http://svn.apache.org/r1831773 2.4.x patch: svn merge -c 1831773 ^/httpd/httpd/trunk . - +1: jailletc36 + +1: jailletc36, icing (by inspection) *) Easy patches: synch 2.4.x and trunk - mod_ssl: Add some missing logno tags. @@ -195,7 +195,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1842882 http://svn.apache.org/r1842884 2.4.x patch: svn merge -c 1830816,1830836,1842882,1842884 ^/httpd/httpd/trunk . - +1: jailletc36 + +1: jailletc36, icing *) core: Split out the ability to parse wildcard files and directories from the Include/IncludeOptional directives into a generic set of