From: Jim Jagielski <jim@apache.org>
Date: Mon, 12 Nov 2012 14:19:00 +0000 (+0000)
Subject: Merge r1407965 from trunk:
X-Git-Tag: 2.4.4~443
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4677c0e05f73846bd42fa123062b1bc090180dc8;p=apache

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


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.4.x@1408296 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/STATUS b/STATUS
index 5e52714a7d..a57389bf8c 100644
--- a/STATUS
+++ b/STATUS
@@ -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 ]
diff --git a/modules/generators/mod_cgi.c b/modules/generators/mod_cgi.c
index a609654524..5a0cb38296 100644
--- a/modules/generators/mod_cgi.c
+++ b/modules/generators/mod_cgi.c
@@ -436,7 +436,7 @@ static apr_status_t run_cgi_child(apr_file_t **script_out,
         ((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