You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by mi...@apache.org on 2013/11/16 19:55:39 UTC
svn commit: r1542549 - in /httpd/httpd/branches/2.4.x: ./ CHANGES STATUS
server/mpm_common.c
Author: minfrin
Date: Sat Nov 16 18:55:39 2013
New Revision: 1542549
URL: http://svn.apache.org/r1542549
Log:
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
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/CHANGES
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/server/mpm_common.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1542338
Modified: httpd/httpd/branches/2.4.x/CHANGES
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/CHANGES?rev=1542549&r1=1542548&r2=1542549&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/CHANGES [utf-8] (original)
+++ httpd/httpd/branches/2.4.x/CHANGES [utf-8] Sat Nov 16 18:55:39 2013
@@ -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]
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1542549&r1=1542548&r2=1542549&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Sat Nov 16 18:55:39 2013
@@ -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 ]
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=1542549&r1=1542548&r2=1542549&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 16 18:55:39 2013
@@ -378,6 +378,7 @@ const char *ap_mpm_set_max_mem_free(cmd_
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(
return err;
}
+ errno = 0;
value = strtol(arg, NULL, 10);
if (value < 0 || errno == ERANGE)
return apr_pstrcat(cmd->pool, "Invalid ThreadStackSize value: ",