From: Ruediger Pluem <rpluem@apache.org>
Date: Thu, 1 Feb 2018 07:34:02 +0000 (+0000)
Subject: * When mod_http2 is loaded more then ThreadsPerChild backend connections can
X-Git-Tag: 2.5.0-alpha2-ci-test-only~2905
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ea3db080a7069c4b023dc848accdb4aaf668859;p=thirdparty%2Fapache%2Fhttpd.git

* When mod_http2 is loaded more then ThreadsPerChild backend connections can
  be useful as mod_http2 has an additional thread pool on top of
  ThreadsPerChild.
  But leave the default with ThreadsPerChild.


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

diff --git a/modules/proxy/proxy_util.c b/modules/proxy/proxy_util.c
index d704dae37da..c8b629e8c70 100644
--- a/modules/proxy/proxy_util.c
+++ b/modules/proxy/proxy_util.c
@@ -1841,8 +1841,7 @@ PROXY_DECLARE(apr_status_t) ap_proxy_initialize_worker(proxy_worker *worker, ser
 
         ap_mpm_query(AP_MPMQ_MAX_THREADS, &mpm_threads);
         if (mpm_threads > 1) {
-            /* Set hard max to no more then mpm_threads */
-            if (worker->s->hmax == 0 || worker->s->hmax > mpm_threads) {
+            if (worker->s->hmax == 0) {
                 worker->s->hmax = mpm_threads;
             }
             if (worker->s->smax == -1 || worker->s->smax > worker->s->hmax) {