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 CBAC9172F1 for ; Thu, 5 Feb 2015 21:03:05 +0000 (UTC) Received: (qmail 99343 invoked by uid 500); 5 Feb 2015 21:03:05 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 99283 invoked by uid 500); 5 Feb 2015 21:03:05 -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 99273 invoked by uid 99); 5 Feb 2015 21:03:05 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 05 Feb 2015 21:03:05 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id 38483AC006D; Thu, 5 Feb 2015 21:03:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1657692 - in /httpd/httpd/trunk: modules/filters/mod_filter.c os/unix/unixd.c server/mpm_common.c Date: Thu, 05 Feb 2015 21:03:04 -0000 To: cvs@httpd.apache.org From: jailletc36@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150205210305.38483AC006D@hades.apache.org> Author: jailletc36 Date: Thu Feb 5 21:03:04 2015 New Revision: 1657692 URL: http://svn.apache.org/r1657692 Log: Save a few bytes in conf pool when parsing some directives. Use temp_pool when applicable. Modified: httpd/httpd/trunk/modules/filters/mod_filter.c httpd/httpd/trunk/os/unix/unixd.c httpd/httpd/trunk/server/mpm_common.c Modified: httpd/httpd/trunk/modules/filters/mod_filter.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/filters/mod_filter.c?rev=1657692&r1=1657691&r2=1657692&view=diff ============================================================================== --- httpd/httpd/trunk/modules/filters/mod_filter.c (original) +++ httpd/httpd/trunk/modules/filters/mod_filter.c Thu Feb 5 21:03:04 2015 @@ -362,7 +362,7 @@ static const char *filter_protocol(cmd_p } /* Now set flags from our args */ - for (arg = apr_strtok(apr_pstrdup(cmd->pool, proto), sep, &tok); + for (arg = apr_strtok(apr_pstrdup(cmd->temp_pool, proto), sep, &tok); arg; arg = apr_strtok(NULL, sep, &tok)) { if (!strcasecmp(arg, "change=yes")) { Modified: httpd/httpd/trunk/os/unix/unixd.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/os/unix/unixd.c?rev=1657692&r1=1657691&r2=1657692&view=diff ============================================================================== --- httpd/httpd/trunk/os/unix/unixd.c (original) +++ httpd/httpd/trunk/os/unix/unixd.c Thu Feb 5 21:03:04 2015 @@ -74,7 +74,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd return; } - if (*(str = ap_getword_conf(cmd->pool, &arg)) != '\0') { + if (*(str = ap_getword_conf(cmd->temp_pool, &arg)) != '\0') { if (!strcasecmp(str, "max")) { cur = limit->rlim_max; } @@ -88,7 +88,7 @@ AP_DECLARE(void) ap_unixd_set_rlimit(cmd return; } - if (arg2 && (*(str = ap_getword_conf(cmd->pool, &arg2)) != '\0')) { + if (arg2 && (*(str = ap_getword_conf(cmd->temp_pool, &arg2)) != '\0')) { max = atol(str); } Modified: httpd/httpd/trunk/server/mpm_common.c URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/server/mpm_common.c?rev=1657692&r1=1657691&r2=1657692&view=diff ============================================================================== --- httpd/httpd/trunk/server/mpm_common.c (original) +++ httpd/httpd/trunk/server/mpm_common.c Thu Feb 5 21:03:04 2015 @@ -360,7 +360,7 @@ const char *ap_mpm_set_coredumpdir(cmd_p return err; } - fname = ap_server_root_relative(cmd->pool, arg); + fname = ap_server_root_relative(cmd->temp_pool, arg); if (!fname) { return apr_pstrcat(cmd->pool, "Invalid CoreDumpDirectory path ", arg, NULL);