From 573b192a433804b30e56a2748a668d09e70f7abf Mon Sep 17 00:00:00 2001 From: Jim Jagielski Date: Tue, 11 Dec 2018 14:07:01 +0000 Subject: [PATCH] some tested backports git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1848679 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/STATUS b/STATUS index f084a631e94..a71c33a5cf5 100644 --- a/STATUS +++ b/STATUS @@ -194,14 +194,14 @@ 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, icing, jorton + +1: jailletc36, icing, jorton, jim *) core: Split out the ability to parse wildcard files and directories from the Include/IncludeOptional directives into a generic set of functions ap_dir_nofnmatch() and ap_dir_fnmatch(). trunk patch: http://svn.apache.org/r1847430 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/httpd-ap_dir_fnmatch.patch - +1: minfrin + +1: minfrin, jim *) core: Fix incorrect substitution of env vars in directives containing multiple env vars. In ap_resolve_env(), the string returned from @@ -209,13 +209,13 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: statically allocated. trunk patch: http://svn.apache.org/r1848236 2.4.x patch: svn merge -c 1848236 ^/httpd/httpd/trunk . - +1: hwibell, covener + +1: hwibell, covener, jim *) mod_log_config: Support %{c}h for conn-hostname, %h for useragent_host PR 55348 trunk patch: https://svn.apache.org/r1730129 2.4.x patch: svn merge -c 1730129 ^/httpd/httpd/trunk . - +1: wrowe + +1: wrowe, jim *) mod_md: Don't export all symbols on Unix (reduces .so size by ~8%) trunk patch: https://svn.apache.org/r1830747 -- 2.47.3