From 0f8ae344b67f87f88d492a5f36ab78e9c9eb4b44 Mon Sep 17 00:00:00 2001 From: Graham Leggett Date: Sat, 16 Nov 2013 18:55:39 +0000 Subject: [PATCH] Potential rejection of valid MaxMemFree and ThreadStackSize directives trunk patch: https://svn.apache.org/r1542338 Submitted by: Mike Rumph Reviewed by: trawick, covener, sf git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1542549 13f79535-47bb-0310-9956-ffa450edef68 --- CHANGES | 3 +++ STATUS | 5 ----- server/mpm_common.c | 2 ++ 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CHANGES b/CHANGES index 3c376d4515..e294c4f895 100644 --- a/CHANGES +++ b/CHANGES @@ -2,6 +2,9 @@ Changes with Apache 2.4.7 + *) Fix potential rejection of valid MaxMemFree and ThreadStackSize + directives. [Mike Rumph ] + *) mod_proxy_fcgi: Remove 64K limit on encoded length of all envvars. An individual envvar with an encoded length of more than 16K will be omitted. [Jeff Trawick] diff --git a/STATUS b/STATUS index cfe047f031..2bbd0ad77d 100644 --- a/STATUS +++ b/STATUS @@ -97,11 +97,6 @@ RELEASE SHOWSTOPPERS: PATCHES ACCEPTED TO BACKPORT FROM TRUNK: [ start all new proposals below, under PATCHES PROPOSED. ] - * potential rejection of valid MaxMemFree and ThreadStackSize directives - trunk patch: https://svn.apache.org/r1542338 - 2.4.x patch: trunk patch works - +1: trawick, covener, sf - PATCHES PROPOSED TO BACKPORT FROM TRUNK: [ New proposals should be added at the end of the list ] diff --git a/server/mpm_common.c b/server/mpm_common.c index 4448ec60dc..348e667606 100644 --- a/server/mpm_common.c +++ b/server/mpm_common.c @@ -378,6 +378,7 @@ const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy, return err; } + errno = 0; value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid MaxMemFree value: ", @@ -397,6 +398,7 @@ const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy, return err; } + errno = 0; value = strtol(arg, NULL, 10); if (value < 0 || errno == ERANGE) return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ", -- 2.50.1