From: Eric Covener Date: Wed, 1 Jun 2022 12:21:45 +0000 (+0000) Subject: Merge r1901494 from trunk: X-Git-Tag: 2.4.54-rc1-candidate~25 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6503d09ab51047554c384a6d03646ce1a8848120;p=thirdparty%2Fapache%2Fhttpd.git Merge r1901494 from trunk: fix types git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1901495 13f79535-47bb-0310-9956-ffa450edef68 --- diff --git a/server/util.c b/server/util.c index 38080dc5dd1..3f1a6c838e5 100644 --- a/server/util.c +++ b/server/util.c @@ -185,7 +185,7 @@ AP_DECLARE(char *) ap_ht_time(apr_pool_t *p, apr_time_t t, const char *fmt, */ AP_DECLARE(int) ap_strcmp_match(const char *str, const char *expected) { - int x, y; + apr_size_t x, y; for (x = 0, y = 0; expected[y]; ++y, ++x) { if (expected[y] == '*') { @@ -209,7 +209,7 @@ AP_DECLARE(int) ap_strcmp_match(const char *str, const char *expected) AP_DECLARE(int) ap_strcasecmp_match(const char *str, const char *expected) { - int x, y; + apr_size_t x, y; for (x = 0, y = 0; expected[y]; ++y, ++x) { if (!str[x] && expected[y] != '*')