You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by co...@apache.org on 2021/08/11 10:50:43 UTC

svn commit: r1892208 - /httpd/httpd/branches/2.4.x/STATUS

Author: covener
Date: Wed Aug 11 10:50:43 2021
New Revision: 1892208

URL: http://svn.apache.org/viewvc?rev=1892208&view=rev
Log:
add apr15 compat [skip ci]

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=1892208&r1=1892207&r2=1892208&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Wed Aug 11 10:50:43 2021
@@ -268,8 +268,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
 
  *) core: ap_timeout_parameter_parse UBI fuzz fix followup
     trunk patch: http://svn.apache.org/r1892185
-    svn merge -c 1892185 ^/httpd/httpd/trunk .
-    +1: covener, jailletc36, 
+    trunk patch: http://svn.apache.org/r1892207
+    svn merge -c 1892185,1892207 ^/httpd/httpd/trunk .
+    +1: covener
 
 PATCHES/ISSUES THAT ARE BEING WORKED
   [ New entries should be added at the START of the list ]