Commit aad2fc60 authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files

Propose a rational backport. 

Overthinking our interaction with APR is a deep hole we don't want to go down.
For 2.next, of course we will throw away all this code, but this is a stopgap
with a future #define compatibility wrapper once we get that far.

Now, with extra history...




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

STATUS

+19 −10
Original line number Diff line number Diff line
@@ -184,16 +184,25 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 
     -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 [Notes this patch creates binary incompatible versions of httpd

                with this change; there must be #else stubs in util.c sources

                compiled against APR 1.6+ for binary compatibility, even if

                these are simply;

                AP_DECLARE(int) ap_cstr_casecmpn(const char *s1,

                                                 const char *s2, apr_size_t n)

                {

                    return apr_cstr_casecmpn(s1, s2, n);

                }

               ]

     -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

     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

     +1: wrowe



  *) abs: Add OPENSSL_Applink in Visual Studio >= 2015 or abs fails with a no

     OPENSSL_Applink error. PR59630