Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm
Precedence: bulk
Reply-To: dev@httpd.apache.org
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r572628 - in /httpd/httpd/branches/2.2.x: CHANGES STATUS
 docs/manual/mod/mod_mem_cache.xml modules/cache/mod_mem_cache.c
Date: Tue, 04 Sep 2007 11:39:59 -0000
To: cvs@httpd.apache.org
From: jim@apache.org
Message-Id: <20070904113959.CEC491A9832@eris.apache.org>

Author: jim
Date: Tue Sep  4 04:39:58 2007
New Revision: 572628

URL: http://svn.apache.org/viewvc?rev=572628&view=rev
Log:
Merge r469895 from trunk:

* Increase the minimum and default value for MCacheMinObjectSize from 0 to 1,
  as a MCacheMinObjectSize of 0 does not make sense and leads to a
  signal Floating point exception (8) (division by zero) in
  memcache_gdsf_algorithm.

PR: 40576
Submitted by: Xuekun Hu <xuekun.hu gmail.com>
Reviewed by: rpluem

Submitted by: rpluem
Reviewed by: jim

Modified:
    httpd/httpd/branches/2.2.x/CHANGES
    httpd/httpd/branches/2.2.x/STATUS
    httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml
    httpd/httpd/branches/2.2.x/modules/cache/mod_mem_cache.c

Modified: httpd/httpd/branches/2.2.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/CHANGES?rev=572628&r1=572627&r2=572628&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.2.x/CHANGES [utf-8] Tue Sep  4 04:39:58 2007
@@ -1,6 +1,11 @@
                                                         -*- coding: utf-8 -*-
 Changes with Apache 2.2.6
 
+  *) mod_mem_cache: Increase the minimum and default value for
+     MCacheMinObjectSize from 0 to 1, as a MCacheMinObjectSize of 0 does not
+     make sense and leads to a division by zero.  PR 40576.
+     [Xuekun Hu <xuekun.hu gmail.com>]
+
   *) mod_cache: Remove expired content from cache that cannot be revalidated.
      PR 30370. [Ruediger Pluem]
 

Modified: httpd/httpd/branches/2.2.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/STATUS?rev=572628&r1=572627&r2=572628&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/STATUS (original)
+++ httpd/httpd/branches/2.2.x/STATUS Tue Sep  4 04:39:58 2007
@@ -80,16 +80,6 @@
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
 
-    * mod_mem_cache: Increase the minimum and default value for
-      MCacheMinObjectSize from 0 to 1, as a MCacheMinObjectSize of 0 does
-      not make sense and leads to a signal Floating point exception (8)
-      (division by zero) in memcache_gdsf_algorithm. PR 40576.
-      Trunk version of patch:
-         http://svn.apache.org/viewcvs.cgi?rev=469895&view=rev
-      Backport version for 2.2.x of patch:
-         Trunk version of patch works
-      +1: rpluem, fielding, jim
-
     * mod_ssl: Fix spurious hostname-mismatch warning for valid wildcard certs.
       PR 37911.
       Trunk version of patch:

Modified: httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml?rev=572628&r1=572627&r2=572628&view=diff
==============================================================================
--- httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml (original)
+++ httpd/httpd/branches/2.2.x/docs/manual/mod/mod_mem_cache.xml Tue Sep  4 04:39:58 2007
@@ -106,7 +106,7 @@
 <description>The minimum size (in bytes) of a document to be allowed in the
 cache</description>
 <syntax>MCacheMinObjectSize <var>bytes</var></syntax>
-<default>MCacheMinObjectSize 0</default>
+<default>MCacheMinObjectSize 1</default>
 <contextlist><context>server config</context></contextlist>
 
 <usage>

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=572628&r1=572627&r2=572628&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 Tue Sep  4 04:39:58 2007
@@ -92,7 +92,7 @@
 static mem_cache_conf *sconf;
 
 #define DEFAULT_MAX_CACHE_SIZE 100*1024
-#define DEFAULT_MIN_CACHE_OBJECT_SIZE 0
+#define DEFAULT_MIN_CACHE_OBJECT_SIZE 1
 #define DEFAULT_MAX_CACHE_OBJECT_SIZE 10000
 #define DEFAULT_MAX_OBJECT_CNT 1009
 #define DEFAULT_MAX_STREAMING_BUFFER_SIZE 100000
@@ -879,9 +879,12 @@
     apr_size_t val;
 
     if (sscanf(arg, "%" APR_SIZE_T_FMT, &val) != 1) {
-        return "MCacheMinObjectSize value must be an integer (bytes)";
+        return "MCacheMinObjectSize value must be an positive integer (bytes)";
     }
-    sconf->min_cache_object_size = val;
+    if (val > 0)
+       sconf->min_cache_object_size = val;
+    else
+       return  "MCacheMinObjectSize value must be an positive integer (bytes)";
     return NULL;
 }
 static const char