Major issue with these two specific edits falling into r1747469

is that it becomes impossible to cleanly merge into branches/2.4.x.

Reverting this one functional/historical edit, to recommit for merging.



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/trunk@1747477 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 15 insertions, 24 deletions

diff --git a/include/httpd.h b/include/httpd.h
index f2c7c12ca7..585a89d5e3 100644
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -2470,32 +2470,23 @@ AP_DECLARE(int) ap_array_str_contains(const apr_array_header_t *array,
                                       const char *s);
 
 /**
- * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
- * treating upper and lower case values of the 26 standard C/POSIX alphabetic
- * characters as equivalent. Extended latin characters outside of this set
- * are treated as unique octets, irrespective of the current locale.
- *
- * Returns in integer greater than, equal to, or less than 0,
- * according to whether @a str1 is considered greater than, equal to,
- * or less than @a str2.
- *
- * @note Same code as apr_cstr_casecmp, which arrives in APR 1.6
+ * Known-fast version of strcasecmp(): ASCII case-folding, POSIX compliant
+ * @param s1 The 1st string to compare
+ * @param s2 The 2nd string to compare
+ * @return 0 if s1 is lexicographically equal to s2 ignoring case;
+ *         non-0 otherwise.
  */
-AP_DECLARE(int) ap_cstr_casecmp(const char *s1, const char *s2);
+AP_DECLARE(int) ap_casecmpstr(const char *s1, const char *s2);
 
 /**
- * Perform a case-insensitive comparison of two strings @a atr1 and @a atr2,
- * treating upper and lower case values of the 26 standard C/POSIX alphabetic
- * characters as equivalent. Extended latin characters outside of this set
- * are treated as unique octets, irrespective of the current locale.
- *
- * Returns in integer greater than, equal to, or less than 0,
- * according to whether @a str1 is considered greater than, equal to,
- * or less than @a str2.
- *
- * @note Same code as apr_cstr_casecmp, which arrives in APR 1.6
+ * Known-fast version of strncasecmp(): ASCII case-folding, POSIX compliant
+ * @param s1 The 1st string to compare
+ * @param s2 The 2nd string to compare
+ * @param n  Maximum number of characters in the strings to compare
+ * @return 0 if s1 is lexicographically equal to s2 ignoring case;
+ *         non-0 otherwise.
  */
-AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n);
+AP_DECLARE(int) ap_casecmpstrn(const char *s1, const char *s2, apr_size_t n);
 
 #ifdef __cplusplus
 }
diff --git a/server/util.c b/server/util.c
index a80c0ecfab..70d8038cc9 100644
--- a/server/util.c
+++ b/server/util.c
@@ -3316,7 +3316,7 @@ static const short ucharmap[] = {
 };
 #endif
 
-AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2)
+AP_DECLARE(int) ap_casecmpstrn(const char *s1, const char *s2)
 {
     const unsigned char *str1 = (const unsigned char *)s1;
     const unsigned char *str2 = (const unsigned char *)s2;
@@ -3333,7 +3333,7 @@ AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2)
     }
 }
 
-AP_DECLARE(int) ap_cstr_casecmpn(const char *s1, const char *s2, apr_size_t n)
+AP_DECLARE(int) ap_casecmpstrn(const char *s1, const char *s2, apr_size_t n)
 {
     const unsigned char *str1 = (const unsigned char *)s1;
     const unsigned char *str2 = (const unsigned char *)s2;