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

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

diff --git a/modules/cache/cache_util.c b/modules/cache/cache_util.c
index aa049132d1e32d48e46030ea91e93886f67c54ce..fc36431c1a74265462a2e310bed4cf14134a6dbe 100644 (file)
--- a/modules/cache/cache_util.c
+++ b/modules/cache/cache_util.c
@@ -30,7 +30,7 @@ extern module AP_MODULE_DECLARE_DATA cache_module;
 /* 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

diff --git a/modules/cache/mod_cache_disk.c b/modules/cache/mod_cache_disk.c
index 4b1e0227bf3c419ff064549c4c4ccd7b1fca67f5..8d17a195f3c64ca468da74b52bac186b017a4509 100644 (file)
--- a/modules/cache/mod_cache_disk.c
+++ b/modules/cache/mod_cache_disk.c
@@ -713,7 +713,7 @@ static apr_status_t read_array(request_rec *r, apr_array_header_t* arr,
                                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_handle_t *handle, request_rec *r,
 {
     char w[MAX_STRING_LEN];
     char *l;
-    int p;
+    apr_size_t p;
     apr_status_t rv;
 
     while (1) {

diff --git a/modules/mappers/mod_imagemap.c b/modules/mappers/mod_imagemap.c
index 187a500a5d2256f8f4901d51c70cf137729cb8d4..206c0b6d44fb69cbffb5f7356355e4a616f8f39e 100644 (file)
--- a/modules/mappers/mod_imagemap.c
+++ b/modules/mappers/mod_imagemap.c
@@ -319,7 +319,7 @@ static void read_quoted(char **string, char **quoted_part)
 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;

diff --git a/server/util_expr_eval.c b/server/util_expr_eval.c
index 9dbc46d291edd6a3de9eebad0f90ee7e392fdbe6..85c9c11e275aaa8706b9acf0b46514f4a84139d4 100644 (file)
--- a/server/util_expr_eval.c
+++ b/server/util_expr_eval.c
@@ -317,7 +317,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;
@@ -1075,7 +1075,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);