]> granicus.if.org Git - apache/commitdiff
Follow up to r1820810.
authorYann Ylavic <ylavic@apache.org>
Thu, 11 Jan 2018 01:03:16 +0000 (01:03 +0000)
committerYann Ylavic <ylavic@apache.org>
Thu, 11 Jan 2018 01:03:16 +0000 (01:03 +0000)
Join the previous proposal with another one (leak fix), not really
related but code conflicts...

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

STATUS

diff --git a/STATUS b/STATUS
index 2b39a3b91fc0e7762910e6ba170f1f0e4ef9ac54..f8f5dbd75fe1e3fba0f0ba68fcb43ecacfa37429 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -213,12 +213,20 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
      +1: niq, jim
      ylavic: +1 with r1819969 and r1819970, see dev@ thread re r1599012.
 
-  *) mpm_event: Update scoreboard status for KeepAlive state.
+  *) mpm_event: Update scoreboard status for KeepAlive state, plus avoid a
+                small sbh memory leak.
      trunk patch: http://svn.apache.org/r1740910
                   http://svn.apache.org/r1741277
                   http://svn.apache.org/r1820809 (CHANGES)
-     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-event_ka_status.patch
+     diff so far: http://people.apache.org/~ylavic/patches/httpd-2.4.x-event_ka_status.diff
+                  http://svn.apache.org/r1820808
+                  http://svn.apache.org/r1820809 (CHANGES)
+     2.4.x patch: http://people.apache.org/~ylavic/patches/httpd-2.4.x-event_ka_status+sbh_leak.patch
      +1: ylavic
+     ylavic: joint proposal because the second change depends on the
+             ap_update_child_status() added by the first one. Hopefully the
+             first change is simple enough, the second one is quite straight
+             forward too.
 
 
 PATCHES/ISSUES THAT ARE BEING WORKED