Prevent slow graceful restarts on some platforms:

* prefork.c (ap_mpm_run): Only make as many dummy connections as slots
used, not as many as slots are available.

Backport of server/mpm/prefork/prefork.c r1.280 from httpd-2.1
Reviewed by:	Joe Orton, Jeff Trawick, Justin Erenkrantz

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

diff --git a/CHANGES b/CHANGES
index f2fc6d830bcbca1fdc18117335deaca463ca94e4..96b59f1946bd63580f559081198d7f0cdb5c1304 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,7 @@
 Changes with Apache 2.0.49
 
+  *) Fix slow graceful restarts with prefork MPM.  [Joe Orton]
+
   *) Fix a problem with namespace mappings being dropped in mod_dav_fs;
      if any property values were set which defined namespaces these
      came out mangled in the PROPFIND response.  PR 11637.

diff --git a/server/mpm/prefork/prefork.c b/server/mpm/prefork/prefork.c
index 8701918c9a19bc50540d85f4cc9accfff634bbfa..06b8aa20c93e6e44adeaba7c705c73e3ab0ca802 100644 (file)
--- a/server/mpm/prefork/prefork.c
+++ b/server/mpm/prefork/prefork.c
@@ -1167,7 +1167,7 @@ int ap_mpm_run(apr_pool_t *_pconf, apr_pool_t *plog, server_rec *s)
                    "Graceful restart requested, doing restart");
 
        /* kill off the idle ones */
-        ap_mpm_pod_killpg(pod, ap_daemons_limit);
+        ap_mpm_pod_killpg(pod, ap_max_daemons_limit);
 
        /* This is mostly for debugging... so that we know what is still
            * gracefully dealing with existing request.  This will break