Return-Path: X-Original-To: apmail-httpd-cvs-archive@www.apache.org Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 4EB3598BA for ; Sat, 12 Nov 2011 06:01:21 +0000 (UTC) Received: (qmail 19106 invoked by uid 500); 12 Nov 2011 06:01:19 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 19031 invoked by uid 500); 12 Nov 2011 06:01:19 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 19024 invoked by uid 99); 12 Nov 2011 06:01:19 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 06:01:19 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 12 Nov 2011 06:01:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 54B4A23888FD; Sat, 12 Nov 2011 06:00:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1201203 - /httpd/httpd/branches/2.4.x/server/mpm_common.c Date: Sat, 12 Nov 2011 06:00:58 -0000 To: cvs@httpd.apache.org From: rjung@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20111112060058.54B4A23888FD@eris.apache.org> Author: rjung Date: Sat Nov 12 06:00:57 2011 New Revision: 1201203 URL: http://svn.apache.org/viewvc?rev=1201203&view=rev Log: Folloup on r1201161: New MaxMemFree was meant to be 2048, not 4096. Backport of r1201202 from trunk. Modified: httpd/httpd/branches/2.4.x/server/mpm_common.c Modified: httpd/httpd/branches/2.4.x/server/mpm_common.c URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/server/mpm_common.c?rev=1201203&r1=1201202&r2=1201203&view=diff ============================================================================== --- httpd/httpd/branches/2.4.x/server/mpm_common.c (original) +++ httpd/httpd/branches/2.4.x/server/mpm_common.c Sat Nov 12 06:00:57 2011 @@ -147,7 +147,7 @@ int ap_graceful_shutdown_timeout; AP_DECLARE_DATA apr_uint32_t ap_max_mem_free; apr_size_t ap_thread_stacksize; -#define ALLOCATOR_MAX_FREE_DEFAULT (4096*1024) +#define ALLOCATOR_MAX_FREE_DEFAULT (2048*1024) /* Set defaults for config directives implemented here. This is * called from core's pre-config hook, so MPMs which need to override