Potential rejection of valid MaxMemFree and ThreadStackSize directives

trunk patch: https://svn.apache.org/r1542338

Submitted by: Mike Rumph <mike.rumph oracle.com>
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

diff --git a/CHANGES b/CHANGES
index 3c376d45154ac45a3fb4053c6ff8d5c4a6dde9a9..e294c4f895bc6fefd60ccfed759f14b9826e0403 100644 (file)
--- 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 <mike.rumph oracle.com>]
+
   *) 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 cfe047f031275485efb0ee270119815afac150cb..2bbd0ad77d5af22705efbb9bf6708941ca404b8f 100644 (file)
--- 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 4448ec60dcf14bebe42b3ed45096dd3ca4fad051..348e66760662ca139e6ae85e5514eacb1fb10cf0 100644 (file)
--- 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: ",