svn commit: r1885806 - in /httpd/httpd/branches/2.4.x: modules/cache/cache_util.c modules/cache/mod_cache_disk.c modules/mappers/mod_imagemap.c server/util_expr_eval.c

[ja...@apache.org]

Author: jailletc36
Date: Fri Jan 22 16:46:12 2021
New Revision: 1885806

URL: http://svn.apache.org/viewvc?rev=1885806&view=rev
Log:
Merge r1881303,r1881304,r1881305,r1881306 from trunk

  *) Fix some Windows 64 compilation warnings

Submitted by: jailletc36
Reviewed by: jailletc36, minfrin, ylavic (by inspection)
Backported by: jailletc36

Modified:
    httpd/httpd/branches/2.4.x/modules/cache/cache_util.c
    httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c
    httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c
    httpd/httpd/branches/2.4.x/server/util_expr_eval.c

Modified: httpd/httpd/branches/2.4.x/modules/cache/cache_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/cache_util.c?rev=1885806&r1=1885805&r2=1885806&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/cache_util.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/cache_util.c Fri Jan 22 16:46:12 2021
@@ -30,7 +30,7 @@ extern module AP_MODULE_DECLARE_DATA cac
 /* Determine if "url" matches the hostname, scheme and port and path
  * in "filter". All but the path comparisons are case-insensitive.
  */
-static int uri_meets_conditions(const apr_uri_t *filter, const int pathlen,
+static int uri_meets_conditions(const apr_uri_t *filter, const apr_size_t pathlen,
                                 const apr_uri_t *url, const char *path)
 {
     /* Scheme, hostname port and local part. The filter URI and the

Modified: httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c?rev=1885806&r1=1885805&r2=1885806&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c (original)
+++ httpd/httpd/branches/2.4.x/modules/cache/mod_cache_disk.c Fri Jan 22 16:46:12 2021
@@ -713,7 +713,7 @@ static apr_status_t read_array(request_r
                                apr_file_t *file)
 {
     char w[MAX_STRING_LEN];
-    int p;
+    apr_size_t p;
     apr_status_t rv;
 
     while (1) {
@@ -778,7 +778,7 @@ static apr_status_t read_table(cache_han
 {
     char w[MAX_STRING_LEN];
     char *l;
-    int p;
+    apr_size_t p;
     apr_status_t rv;
 
     while (1) {

Modified: httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c?rev=1885806&r1=1885805&r2=1885806&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c (original)
+++ httpd/httpd/branches/2.4.x/modules/mappers/mod_imagemap.c Fri Jan 22 16:46:12 2021
@@ -319,7 +319,7 @@ static void read_quoted(char **string, c
 static const char *imap_url(request_rec *r, const char *base, const char *value)
 {
 /* translates a value into a URL. */
-    int slen, clen;
+    apr_size_t slen, clen;
     char *string_pos = NULL;
     const char *string_pos_const = NULL;
     char *directory = NULL;

Modified: httpd/httpd/branches/2.4.x/server/util_expr_eval.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/util_expr_eval.c?rev=1885806&r1=1885805&r2=1885806&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/server/util_expr_eval.c (original)
+++ httpd/httpd/branches/2.4.x/server/util_expr_eval.c Fri Jan 22 16:46:12 2021
@@ -317,7 +317,7 @@ static int ap_expr_eval_comp(ap_expr_eva
 /* 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;
@@ -1075,7 +1075,7 @@ static const char *sha1_func(ap_expr_eva
     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);