From: Christophe Jaillet <jailletc36@apache.org>
Date: Sat, 29 Aug 2020 20:30:41 +0000 (+0000)
Subject: Fix a few warnings on 64 bits windows compilation
X-Git-Tag: 2.5.0-alpha2-ci-test-only~1223
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74d32d7bafd3ae377bfbdd06fc5b5f78e14a9350;p=thirdparty%2Fapache%2Fhttpd.git

Fix a few warnings on 64 bits windows compilation

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

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 45cba52f987..765a1a8b676 100644
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -521,7 +521,7 @@ static int ap_expr_eval_comp(ap_expr_eval_ctx_t *ctx, const ap_expr_t *node)
 /* combined string/int comparison for compatibility with ssl_expr */
 static int strcmplex(const char *str1, const char *str2)
 {
-    int i, n1, n2;
+    apr_size_t i, n1, n2;
 
     if (str1 == NULL)
         return -1;
@@ -1395,7 +1395,7 @@ static const char *sha1_func(ap_expr_eval_ctx_t *ctx, const void *data,
     out = apr_palloc(ctx->p, APR_SHA1_DIGESTSIZE*2+1);
 
     apr_sha1_init(&context);
-    apr_sha1_update(&context, arg, strlen(arg));
+    apr_sha1_update(&context, arg, (unsigned int)strlen(arg));
     apr_sha1_final(sha1, &context);
 
     ap_bin2hex(sha1, APR_SHA1_DIGESTSIZE, out);