You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ja...@apache.org on 2019/11/08 21:06:22 UTC
svn commit: r1869584 - /httpd/httpd/branches/2.4.x/STATUS
Author: jailletc36
Date: Fri Nov 8 21:06:22 2019
New Revision: 1869584
URL: http://svn.apache.org/viewvc?rev=1869584&view=rev
Log:
Remove duplicated r1862202 and r1864759 from first proposal (and from Yann's notes).
Promote Yann's vote accordingly.
Fix follow-up reference.
Modified:
httpd/httpd/branches/2.4.x/STATUS
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1869584&r1=1869583&r2=1869584&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Fri Nov 8 21:06:22 2019
@@ -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