jim at apache
Aug 2, 2012, 6:09 AM
Post #1 of 1
(24 views)
Permalink
|
|
svn commit: r1368453 - in /httpd/httpd/branches/2.4.x: ./ STATUS include/httpd.h
|
|
Author: jim
Date: Thu Aug 2 13:09:30 2012
New Revision: 1368453
URL: http://svn.apache.org/viewvc?rev=1368453&view=rev
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/include/httpd.h
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1366319
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1368453&r1=1368452&r2=1368453&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Thu Aug 2 13:09:30 2012
@@ -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 ]
Modified: httpd/httpd/branches/2.4.x/include/httpd.h
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/include/httpd.h?rev=1368453&r1=1368452&r2=1368453&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/include/httpd.h (original)
+++ httpd/httpd/branches/2.4.x/include/httpd.h Thu Aug 2 13:09:30 2012
@@ -1722,7 +1722,7 @@ AP_DECLARE(int) ap_is_matchexp(const cha
* 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 ch
* 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);
|
