Merge r1366319 from trunk:

ap_str(case)cmp_match returns the opposite of what is advertized in the header.
Submitted by: humbedooh
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 24aefc1f061a0d2bf99a3f2fcec5140c51d26e18..09d1d45a9518cb47105520a910faf957760f081a 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -88,11 +88,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * headers: ap_str(case)cmp_match returns the opposite of what is advertized
-     in the header.
-     trunk patch: http://svn.apache.org/viewvc?view=revision&revision=1366319
-     2.4.x patch: Trunk patch applies.
-     +1: rjung, humbedooh, jim
 
 PATCHES PROPOSED TO BACKPORT FROM TRUNK:
   [ New proposals should be added at the end of the list ]

diff --git a/include/httpd.h b/include/httpd.h
index e718bfc7c1161ae2ae448236d8c4c6b15fb28b32..461cf5eeb50e8cd8e65fa976f7e9096468ff7d9d 100644 (file)
--- a/include/httpd.h
+++ b/include/httpd.h
@@ -1722,7 +1722,7 @@ AP_DECLARE(int) ap_is_matchexp(const char *str);
  * Determine if a string matches a patterm containing the wildcards '?' or '*'
  * @param str The string to check
  * @param expected The pattern to match against
- * @return 1 if the two strings match, 0 otherwise
+ * @return 0 if the two strings match, 1 otherwise
  */
 AP_DECLARE(int) ap_strcmp_match(const char *str, const char *expected);
 
@@ -1731,7 +1731,7 @@ AP_DECLARE(int) ap_strcmp_match(const char *str, const char *expected);
  * ignoring case
  * @param str The string to check
  * @param expected The pattern to match against
- * @return 1 if the two strings match, 0 otherwise
+ * @return 0 if the two strings match, 1 otherwise
  */
 AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *expected);