From: Yann Ylavic Date: Fri, 9 Mar 2018 09:52:17 +0000 (+0000) Subject: -tabs X-Git-Tag: 2.4.32~5 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0f3623f1756a4c00517c1b0da726ff5fb2dadd2b;p=apache -tabs git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1826316 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index eaeac8a44f..a90a1abe28 100644 --- a/STATUS +++ b/STATUS @@ -133,8 +133,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: trunk patch: http://svn.apache.org/r1609680 http://svn.apache.org/r1609688 http://svn.apache.org/r1641381 - http://svn.apache.org/r1826289 - http://svn.apache.org/r1826313 + http://svn.apache.org/r1826289 + http://svn.apache.org/r1826313 ylavic: Merge patch provided (reusing new->real to avoid double de_socketfy() call). Also added missing r1609688 to the patchset. 2.4.x patch: http://home.apache.org/~ylavic/patches/httpd-2.4.x-ap_proxy_define_match_worker-v2.patch