From: Christophe Jaillet Date: Sun, 10 Jan 2021 16:40:38 +0000 (+0000) Subject: Proposal to synch most of the ap_cstr_casecmp[n] mess between 2.4.x and trunk X-Git-Tag: 2.4.47~172 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=51ccd2110e0864da26f2f8caa5e8f27cfd25549f;p=thirdparty%2Fapache%2Fhttpd.git Proposal to synch most of the ap_cstr_casecmp[n] mess between 2.4.x and trunk [skip ci] git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1885337 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/STATUS b/STATUS index a10046b6ce9..76c4f8c3a73 100644 --- a/STATUS +++ b/STATUS @@ -355,6 +355,27 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK: 2.4.x patch: svn merge -c 1810233,1827530,1874144,1877262,1878263,1880461,1882053,1882060,1883452,1884551 ^/httpd/httpd/trunk . +1: jailletc36 + *) Synch 2.4.x and trunk + When ap_cstr_casecmp[n] have been introduced, in r1747469, it has introduced + many differences between 2.4.x and trunk. + Direct backporting was not that easy because: + - it was initialy introduced as ap_casecmpstr[n] with several patches + - it touched some files that were not in 2.4.x branch + Later, parts of it have already been backported. + The proposed patch try to clean all this. + I've done my best to remove parts that rely on code that has not been + been backported in 2.4.x yet (r1610674 for example). Should it be done + one day, leaving it as-is can ease the backport. + To ease the review, a few greps: + grep "^-.*strcasecmp" r1747469.diff | wc -l --> 233 + grep "^+.*ap_cstr_casecmp[^n]" r1747469.diff | wc -l --> 233 + grep "^-.*strncasecmp" r1747469.diff | wc -l --> 51 + grep "^+.*ap_cstr_casecmpn" r1747469.diff | wc -l --> 51 + It has been compile tested and, unless I've missed something, should be + compatible with the huge Yann's serie above. + 2.4.x patch: http://home.apache.org/~jailletc36/r1747469.diff + +1: jailletc36 + PATCHES/ISSUES THAT ARE BEING WORKED [ New entries should be added at the START of the list ]