From: Yann Ylavic <ylavic@apache.org>
Date: Sun, 19 Apr 2015 21:13:27 +0000 (+0000)
Subject: Comment on r1674697.
X-Git-Tag: 2.4.13~180
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=131295b320d3556847fa5887737feacb7b411966;p=thirdparty%2Fapache%2Fhttpd.git

Comment on r1674697.

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

diff --git a/STATUS b/STATUS
index 7f376159de5..9d183589361 100644
--- a/STATUS
+++ b/STATUS
@@ -268,7 +268,8 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   *) mpm_event: Allow for timer events duplicates.
      trunk patch: http://svn.apache.org/r1666468
                   http://svn.apache.org/r1666618
-     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-event_timers_duplicates.patch
+                  http://svn.apache.org/r1674697
+     2.4.x patch: http://people.apache.org/~ylavic/httpd-2.4.x-event_timers_duplicates-v2.patch
      +1: ylavic, covener
      covener: what's the background here? What's currently broken?
      ylavic: I expected to find a common compare function for both MPMs event
@@ -286,6 +287,10 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
               same apr_time_t because the compare function would return 0 and insert_compare
               wouldn't let the duplicate in. post-patch, only two timer_event_t's with the same
               address are equals.
+     ylavic: r1674697 (and v2) removes the debugging checks (not necessary in 2.4.x IMHO),
+             and add a comment about the compare function. As Eric explained above, the real
+             point is to return +1 instead of 0 there, so that duplicates are added after
+             each other (by order of insertion).
 
   *) mod_authz_core: Allow "Require expr" to work when the expression is quoted,
      as in an example in the doc.  PR 56235