Merge r1542549 from 2.4.x:

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.2.x@1777401 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/CHANGES b/CHANGES
index 3f81842f044f5ddf8c548d717a5b4da9f0312758..42ee828033ed0ca3889a3db1dbd31a0cc4485774 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,6 +4,9 @@ Changes with Apache 2.2.32
   *) core: CVE-2016-5387: Mitigate [f]cgi "httpoxy" issues.
      [Dominic Scheirlinck <dominic vendhq.com>, Yann Ylavic]
 
+  *) Fix potential rejection of valid MaxMemFree and ThreadStackSize
+     directives.  [Mike Rumph <mike.rumph oracle.com>]
+
   *) core: Limit to ten the number of tolerated empty lines between request.
      [Yann Ylavic]
 

diff --git a/server/mpm_common.c b/server/mpm_common.c
index ecb0947d8e6ffce8a80173390d6a5cfad2a11843..e02656560f2c177c32143d6ce635874683d36c6a 100644 (file)
--- a/server/mpm_common.c
+++ b/server/mpm_common.c
@@ -1133,6 +1133,7 @@ const char *ap_mpm_set_max_mem_free(cmd_parms *cmd, void *dummy,
         return err;
     }
 
+    errno = 0;
     value = strtol(arg, NULL, 0);
     if (value < 0 || errno == ERANGE)
         return apr_pstrcat(cmd->pool, "Invalid MaxMemFree value: ",
@@ -1157,6 +1158,7 @@ const char *ap_mpm_set_thread_stacksize(cmd_parms *cmd, void *dummy,
         return err;
     }
 
+    errno = 0;
     value = strtol(arg, NULL, 0);
     if (value < 0 || errno == ERANGE)
         return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ",