You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by ji...@apache.org on 2012/11/12 15:19:01 UTC
svn commit: r1408296 - in /httpd/httpd/branches/2.4.x: ./ STATUS
modules/generators/mod_cgi.c
Author: jim
Date: Mon Nov 12 14:19:00 2012
New Revision: 1408296
URL: http://svn.apache.org/viewvc?rev=1408296&view=rev
Log:
Merge r1407965 from trunk:
Replace an incorrect #if by the correct corresponding #if defined(...)
PR 54133 reported by Teodor Milkov ()
Submitted by: jailletc36
Reviewed/backported by: jim
Modified:
httpd/httpd/branches/2.4.x/ (props changed)
httpd/httpd/branches/2.4.x/STATUS
httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c
Propchange: httpd/httpd/branches/2.4.x/
------------------------------------------------------------------------------
Merged /httpd/httpd/trunk:r1407965
Modified: httpd/httpd/branches/2.4.x/STATUS
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/STATUS?rev=1408296&r1=1408295&r2=1408296&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/STATUS (original)
+++ httpd/httpd/branches/2.4.x/STATUS Mon Nov 12 14:19:00 2012
@@ -89,12 +89,6 @@ RELEASE SHOWSTOPPERS:
PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
[ start all new proposals below, under PATCHES PROPOSED. ]
- * mod_cgi: RLimitNPROC doesn't work: wrong #if RLIMIT_NPROC
- PR 54133.
- trunk patch: http://svn.apache.org/viewvc?rev=1407965&view=rev
- 2.4.x patch: trunk patch works (minus CHANGES):
- +1: jailletc36, trawick, jim
-
PATCHES PROPOSED TO BACKPORT FROM TRUNK:
[ New proposals should be added at the end of the list ]
Modified: httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c
URL: http://svn.apache.org/viewvc/httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c?rev=1408296&r1=1408295&r2=1408296&view=diff
==============================================================================
--- httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c (original)
+++ httpd/httpd/branches/2.4.x/modules/generators/mod_cgi.c Mon Nov 12 14:19:00 2012
@@ -436,7 +436,7 @@ static apr_status_t run_cgi_child(apr_fi
((rc = apr_procattr_limit_set(procattr, APR_LIMIT_MEM,
conf->limit_mem)) != APR_SUCCESS) ||
#endif
-#if RLIMIT_NPROC && defined(AP_CGI_USE_RLIMIT)
+#if defined(RLIMIT_NPROC) && defined(AP_CGI_USE_RLIMIT)
((rc = apr_procattr_limit_set(procattr, APR_LIMIT_NPROC,
conf->limit_nproc)) != APR_SUCCESS) ||
#endif