Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 315EF179D9 for ; Mon, 20 Apr 2015 13:14:00 +0000 (UTC) Received: (qmail 14862 invoked by uid 500); 20 Apr 2015 13:14:00 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 14797 invoked by uid 500); 20 Apr 2015 13:14:00 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 14787 invoked by uid 99); 20 Apr 2015 13:13:59 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Apr 2015 13:13:59 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id D2320AC0294 for ; Mon, 20 Apr 2015 13:13:59 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1674838 - /httpd/httpd/branches/2.4.x/STATUS Date: Mon, 20 Apr 2015 13:13:59 -0000 To: cvs@httpd.apache.org From: jim@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150420131359.D2320AC0294@hades.apache.org> Author: jim Date: Mon Apr 20 13:13:59 2015 New Revision: 1674838 URL: http://svn.apache.org/r1674838 Log: comment before vote 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=1674838&r1=1674837&r2=1674838&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/STATUS (original) +++ httpd/httpd/branches/2.4.x/STATUS Mon Apr 20 13:13:59 2015 @@ -300,6 +300,9 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 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). + jim: OK, perfect. Since 2.4 uses apr-1.5, we need to use the same + logic-flow as the comp() function in testskiplist to ensure + that (1) dups are allowed and (2) inserted in the correct place. *) mod_authz_core: Allow "Require expr" to work when the expression is quoted, as in an example in the doc. PR 56235