Mailing List Archive

svn commit: r1885673 - /httpd/httpd/branches/2.4.x/STATUS
Author: ylavic
Date: Mon Jan 18 21:26:30 2021
New Revision: 1885673

URL: http://svn.apache.org/viewvc?rev=1885673&view=rev
Log:
Vote & promote. [skip ci]

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=1885673&r1=1885672&r2=1885673&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Jan 18 21:26:30 2021
@@ -137,6 +137,26 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]

+ *) 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-v2.diff | wc -l --> 233
+ grep "^+.*ap_cstr_casecmp[^n]" r1747469-v2.diff | wc -l --> 233
+ grep "^-.*strncasecmp" r1747469-v2.diff | wc -l --> 49
+ grep "^+.*ap_cstr_casecmpn" r1747469-v2.diff | wc -l --> 49
+ It has been compile tested.
+ 2.4.x patch: http://home.apache.org/~jailletc36/r1747469-v2.diff
+ +1: jailletc36, minfrin, ylavic
+
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[. New proposals should be added at the end of the list ]

@@ -203,26 +223,6 @@ PATCHES PROPOSED TO BACKPORT FROM TRUNK:
svn merge -c 1881303,1881304,1881305,1881306 ^/httpd/httpd/trunk .
+1: jailletc36, minfrin

- *) 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-v2.diff | wc -l --> 233
- grep "^+.*ap_cstr_casecmp[^n]" r1747469-v2.diff | wc -l --> 233
- grep "^-.*strncasecmp" r1747469-v2.diff | wc -l --> 49
- grep "^+.*ap_cstr_casecmpn" r1747469-v2.diff | wc -l --> 49
- It has been compile tested.
- 2.4.x patch: http://home.apache.org/~jailletc36/r1747469-v2.diff
- +1: jailletc36, minfrin
-
PATCHES/ISSUES THAT ARE BEING WORKED
[. New entries should be added at the START of the list ]