From 13c494b4fc3760b2638142da2d7de6f6ac086541 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Mon, 13 Jun 2016 23:29:11 +0000 Subject: [PATCH] Vote and promote. git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1748333 13f79535-47bb-0310-9956-ffa450edef68 --- STATUS | 63 ++++++++++++++++++++-------------------------------------- 1 file changed, 21 insertions(+), 42 deletions(-) diff --git a/STATUS b/STATUS index 2b30ef0cd3..996abb0e94 100644 --- a/STATUS +++ b/STATUS @@ -114,6 +114,27 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] + *) util: Backport apr_cstr_casecmp[n] - without consideration of APR's + release for the time being... + trunk patches: http://svn.apache.org/r1715401 + http://svn.apache.org/r1715404 + http://svn.apache.org/r1715524 + http://svn.apache.org/r1715526 + http://svn.apache.org/r1715527 + http://svn.apache.org/r1715546 + http://svn.apache.org/r1715632 + http://svn.apache.org/r1715736 + http://svn.apache.org/r1715859 + http://svn.apache.org/r1722194 + http://svn.apache.org/r1747468 + http://svn.apache.org/r1747478 + http://svn.apache.org/r1747483 + http://svn.apache.org/r1747484 + 2.4.x rollup patch: Above applies, modulo ap_mmn.h/CHANGES, captured here; + http://raw.githubusercontent.com/wrowe/patches/master/backport-2.4-ap_cstr_casecmp-fns.patch + [corrected SVN credits to brane, who added the thing] + +1: wrowe, jim, minfrin + PATCHES PROPOSED TO BACKPORT FROM TRUNK: @@ -146,48 +167,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: trunk works (modulo CHANGES) +1: ylavic, jim - *) core: ASCII string comparison functions optimized speed. - This proposal includes and renames ap_casecmpstr[n] functions available - in trunk. - The proposed names are the ones used in APR for the same kind of functions. - In order to avoid some new ap_ functions (which are just copies of what is - available in APR 1.6.0+), I propose to use exactly the same names and only - declare and define the functions in httpd if not available in APR. - The same approach has already been used for apr_time_from_msec() for example. - Also note that the implementation in APR and in httpd are slighly different. - If/when aggreed on this backport and function names in httpd, then trunk should - be upgraded accordingly. Uses of the functions could then be backported. - trunk patch: ? - 2.4.x patch: http://home.apache.org/~jailletc36/apr_cstr_casecmp_v2.diff - jailletc36: v2: update as per discussion on dev@. Do not mix ap_ and apr_ - namespaces + tweak DOXYGEN comments. - +1: jailletc36, icing - -0: wrowe [Prefer that we pre-@deprecate this API and encourage users - to adopt the apr_ convention, reversing the #defines, being - ready for the httpd 2.next minor release.] - -1: wrowe [Previously explained, veto remains... alternative follows...] - - *) util: Backport apr_cstr_casecmp[n] - without consideration of APR's - release for the time being... - trunk patches: http://svn.apache.org/r1715401 - http://svn.apache.org/r1715404 - http://svn.apache.org/r1715524 - http://svn.apache.org/r1715526 - http://svn.apache.org/r1715527 - http://svn.apache.org/r1715546 - http://svn.apache.org/r1715632 - http://svn.apache.org/r1715736 - http://svn.apache.org/r1715859 - http://svn.apache.org/r1722194 - http://svn.apache.org/r1747468 - http://svn.apache.org/r1747478 - http://svn.apache.org/r1747483 - http://svn.apache.org/r1747484 - 2.4.x rollup patch: Above applies, modulo ap_mmn.h/CHANGES, captured here; - http://raw.githubusercontent.com/wrowe/patches/master/backport-2.4-ap_cstr_casecmp-fns.patch - [corrected SVN credits to brane, who added the thing] - +1: wrowe, jim - *) abs: Add OPENSSL_Applink in Visual Studio >= 2015 or abs fails with a no OPENSSL_Applink error. PR59630 trunk patch: http://svn.apache.org/r1745767 -- 2.40.0