Merge r1629916 from trunk:

core: follow up to r1629909: ap_daemons_to_start can't be lower than 1 (not 0) for prefork either.
Submitted by: ylavic
Reviewed/backported by: jim

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

diff --git a/STATUS b/STATUS
index 83333fa6bbc3071bf5564a636d7ff1a45282de49..6d482cece602901bc8881f6f4890e336274f04eb 100644 (file)
--- a/STATUS
+++ b/STATUS
@@ -110,12 +110,6 @@ RELEASE SHOWSTOPPERS:
 PATCHES ACCEPTED TO BACKPORT FROM TRUNK:
   [ start all new proposals below, under PATCHES PROPOSED. ]
 
-   * MPMs: Follow up to r1705492 (SO_REUSEPORT). Add missing (and harmless)
-           backport hunk (for consistency with trunk and 2.4.x's worker/event).
-     trunk patch: http://svn.apache.org/r1629916
-     2.4.x patch: trunk works
-     +1: ylavic, jim, rjung
-
    * mod_proxy_balancer: Silence warnings, and fix logic, in XML
      balancer status output.
      trunk patch: http://svn.apache.org/r1705776

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 45d88e46e8e1dfbb88e935ee20d4e8c61c460d83..9d424c545a1160ad8596895116fd46944e0549f1 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1484,7 +1484,7 @@ static int prefork_check_config(apr_pool_t *p, apr_pool_t *plog,
     }
 
     /* ap_daemons_to_start > ap_daemons_limit checked in prefork_run() */
-    if (ap_daemons_to_start < 0) {
+    if (ap_daemons_to_start < 1) {
         if (startup) {
             ap_log_error(APLOG_MARK, APLOG_WARNING | APLOG_STARTUP, 0, NULL, APLOGNO(00184)
                          "WARNING: StartServers of %d not allowed, "