From: William A. Rowe Jr <wrowe@apache.org>
Date: Mon, 1 Mar 2010 17:57:46 +0000 (+0000)
Subject: Backport http://svn.apache.org/viewvc?view=revision&revision=892260
X-Git-Tag: 2.2.15~10
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9b6a6011969a65c553dd14612861d04cd2c9a195;p=thirdparty%2Fapache%2Fhttpd.git

Backport http://svn.apache.org/viewvc?view=revision&revision=892260
ignored the subsequent data type correction of the patch on trunk.

Rather than veto, simply correct this allocation to eliminate a data
type mismatch/truncation of the results of apr_atoi64(), quieting the
only warnings of a win32 build of 2.2 branch.


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

diff --git a/modules/cache/mod_disk_cache.c b/modules/cache/mod_disk_cache.c
index 7c50cd05cbc..f13800b3067 100644
--- a/modules/cache/mod_disk_cache.c
+++ b/modules/cache/mod_disk_cache.c
@@ -1062,7 +1062,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r,
             return APR_EGENERAL;
         }
         if (cl_header) {
-            apr_size_t cl = apr_atoi64(cl_header);
+            apr_int64_t cl = apr_atoi64(cl_header);
             if ((errno == 0) && (dobj->file_size != cl)) {
                 ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                              "disk_cache: URL %s didn't receive complete response, not caching",
diff --git a/modules/cache/mod_mem_cache.c b/modules/cache/mod_mem_cache.c
index 0edf0ffa424..fb988915a1d 100644
--- a/modules/cache/mod_mem_cache.c
+++ b/modules/cache/mod_mem_cache.c
@@ -747,7 +747,7 @@ static apr_status_t store_body(cache_handle_t *h, request_rec *r, apr_bucket_bri
         if (APR_BUCKET_IS_EOS(e)) {
             const char *cl_header = apr_table_get(r->headers_out, "Content-Length");
             if (cl_header) {
-                apr_size_t cl = apr_atoi64(cl_header);
+                apr_int64_t cl = apr_atoi64(cl_header);
                 if ((errno == 0) && (obj->count != cl)) {
                     ap_log_error(APLOG_MARK, APLOG_DEBUG, 0, r->server,
                                  "mem_cache: URL %s didn't receive complete response, not caching",