From: Yann Ylavic Date: Thu, 22 Jul 2021 21:23:00 +0000 (+0000) Subject: Update patch command too [skip ci] X-Git-Tag: candidate-2.4.49~3^2~58 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=370da143a988fe0e866c04391114f1055e79a79e;p=thirdparty%2Fapache%2Fhttpd.git Update patch command too [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1891739 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index da40b4cb6a2..3ea2a475b6c 100644 --- a/STATUS +++ b/STATUS @@ -278,7 +278,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: http://svn.apache.org/r1891216 http://svn.apache.org/r1891284 backport: wget http://people.apache.org/~ylavic/patches/2.4.x-bz_65419+65429-v2.patch - + patch -p0 < 2.4.x-bz_65419+65429.patch + + patch -p0 < 2.4.x-bz_65419+65429-v2.patch + svn merge --record-only -c 1891206,1891216,1891284 ^/httpd/httpd/trunk . + make update-changes +1: ylavic,