httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r917613 - in /httpd/httpd/branches/2.2.x/modules/cache: mod_disk_cache.c mod_mem_cache.c
Date Mon, 01 Mar 2010 17:57:46 GMT
Author: wrowe
Date: Mon Mar  1 17:57:46 2010
New Revision: 917613

URL: http://svn.apache.org/viewvc?rev=917613&view=rev
Log:
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.

Modified:
    httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c
    httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c

Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c?rev=917613&r1=917612&r2=917613&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_disk_cache.c Mon Mar  1 17:57:46 2010
@@ -1062,7 +1062,7 @@
             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",

Modified: httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c?rev=917613&r1=917612&r2=917613&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c (original)
+++ httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c Mon Mar  1 17:57:46 2010
@@ -747,7 +747,7 @@
         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",



Mime
View raw message