From aee8faaa86b67fc7de8719d51580178f36c13f99 Mon Sep 17 00:00:00 2001 From: Joe Orton Date: Tue, 11 Feb 2020 10:01:29 +0000 Subject: [PATCH] Vote, promote, [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1873887 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/STATUS b/STATUS index 44b6aacecd0..c6307f22a93 100644 --- a/STATUS +++ b/STATUS @@ -133,6 +133,23 @@ PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) trap mod_proxy_ftp errors + trunk patch: http://svn.apache.org/r1873745 + 2.4.x patch: svn merge -c 1873745 ^/httpd/httpd/trunk . + +1: covener, minfrin, jorton + + *) factor out default regex flags: + trunk patch: http://svn.apache.org/r1873747 + 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-reg_default.diff + (MMN, ap_regex.h conflicts) + +1: covener, minfrin, jorton + + *) factor out chunked TE checks + trunk patch: http://svn.apache.org/r1873748 + 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-chunk.diff + (MMN conflicts) + +1: covener, minfrin, jorton + PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] @@ -206,23 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1872042,1872062 ^/httpd/httpd/trunk . +1: minfrin, jim - *) trap mod_proxy_ftp errors - trunk patch: http://svn.apache.org/r1873745 - 2.4.x patch: svn merge -c 1873745 ^/httpd/httpd/trunk . - +1: covener, minfrin - - *) factor out default regex flags: - trunk patch: http://svn.apache.org/r1873747 - 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-reg_default.diff - (MMN, ap_regex.h conflicts) - +1: covener, minfrin - - *) factor out chunked TE checks - trunk patch: http://svn.apache.org/r1873748 - 2.4.x patch: http://people.apache.org/~covener/patches/httpd-2.4.x-chunk.diff - (MMN conflicts) - +1: covener, minfrin - PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ] -- 2.47.3