From: Yann Ylavic Date: Thu, 12 Oct 2017 20:01:28 +0000 (+0000) Subject: Friendly link. X-Git-Tag: 2.4.29~35 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7f8784adc442b275872627f5c05c6174d63164c7;p=thirdparty%2Fapache%2Fhttpd.git Friendly link. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1812016 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index 3d90fc95c5c..fe575db9b0d 100644 --- a/STATUS +++ b/STATUS @@ -216,7 +216,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: server config records non-shared instances, set for mod_ssl to make manipulations in post_config safe. trunk patch: svn merge -c 1809302,1809303,1809305,1809311,1809314,1809713 ^/httpd/httpd/trunk . - 2.4.x patch: ^/httpd/httpd/patches/2.4.x/backport-module-flags.diff (merge with alterations for mmn etc.) + 2.4.x patch: https://svn.apache.org/repos/asf/httpd/httpd/patches/2.4.x/backport-module-flags.diff + (merge with alterations for mmn etc.) +1: icing *) mod_proxy: Add missing commit from r1808855 (loadfactor now decimal)