From: Christophe Jaillet <jailletc36@apache.org>
Date: Fri, 8 Nov 2019 21:06:22 +0000 (+0000)
Subject: Remove duplicated r1862202 and r1864759 from first proposal (and from Yann's notes).
X-Git-Tag: 2.4.42~215
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f7c9c03b9314f0c7c666f9c500d30c1358ad3a89;p=thirdparty%2Fapache%2Fhttpd.git

Remove duplicated r1862202 and r1864759 from first proposal (and from Yann's notes).
Promote Yann's vote accordingly.
Fix follow-up reference.

git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1869584 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index bb66cecafb9..43ed0715327 100644
--- a/STATUS
+++ b/STATUS
@@ -207,8 +207,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         - mod_cache_disk: fix a Coverity warning
         - core: Provide TEST_CHAR macro in test_char.h
         - tag some pools
-        - mod_mime_magic: constify some constant data
-        - mod_authz_core: axe some dead code
         - core: Fix a signed/unsigned comparison that can never match
         - mod_session: leave a hint about session expiration at TRACE2
         - mod_ssl: Fix a typo
@@ -218,16 +216,11 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         - http://svn.apache.org/r1842926
         - http://svn.apache.org/r1856490
         - http://svn.apache.org/r1862051
-        - http://svn.apache.org/r1862202
-        - http://svn.apache.org/r1864759
         - http://svn.apache.org/r1864865
         - http://svn.apache.org/r1865871
         - http://svn.apache.org/r1867256
-     2.4.x patch: svn merge -c 1787229,1842919,1842926,1856490,1862051,1862202,1864759,1864865,1865871,1867256 ^/httpd/httpd/trunk . 
-     +1: jailletc36, jim
-     ylavic: +1 with r1869512, follow up to r1862202
-             (btw, r1862202 and r1864759 duplicated below)
-
+     2.4.x patch: svn merge -c 1787229,1842919,1842926,1856490,1862051,1864865,1865871,1867256 ^/httpd/httpd/trunk . 
+     +1: jailletc36, jim, ylavic
 
   *) Easy patches: synch 2.4.x and trunk
         - core: Fix a comment
@@ -247,8 +240,7 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
         - http://svn.apache.org/r1867569
      2.4.x patch: svn merge -c  1851332,1861432,1862202,1864759,1867254,1867255,1867569 ^/httpd/httpd/trunk . 
      +1: jailletc36, jim
-     ylavic: +1 with r1869512, follow up to r1862202
-             (btw, r1862202 and r1864759 duplicated above)
+     ylavic: +1 with r1869512, follow up to r1864759
 
   *) mod_ssl: use OPENSSL_init_ssl() to initialise OpenSSL on versions 1.1+.
      trunk patch: http://svn.apache.org/r1861950