You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by yl...@apache.org on 2018/02/01 15:41:49 UTC
svn commit: r1822883 - /httpd/httpd/trunk/modules/proxy/proxy_util.c
Author: ylavic
Date: Thu Feb 1 15:41:49 2018
New Revision: 1822883
URL: http://svn.apache.org/viewvc?rev=1822883&view=rev
Log:
mod_proxy: follow up to r1822849 and r1822879.
Fix my maths, thanks Stefan and Rüdiger!
Modified:
httpd/httpd/trunk/modules/proxy/proxy_util.c
Modified: httpd/httpd/trunk/modules/proxy/proxy_util.c
URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/modules/proxy/proxy_util.c?rev=1822883&r1=1822882&r2=1822883&view=diff
==============================================================================
--- httpd/httpd/trunk/modules/proxy/proxy_util.c (original)
+++ httpd/httpd/trunk/modules/proxy/proxy_util.c Thu Feb 1 15:41:49 2018
@@ -1843,16 +1843,18 @@ PROXY_DECLARE(apr_status_t) ap_proxy_ini
}
/*
- * When mod_http2 is loaded we might have more processing threads
- * since it has it's own pool of processing threads.
+ * When mod_http2 is loaded we might have more threads since it has
+ * its own pool of processing threads.
*/
ap_mpm_query(AP_MPMQ_MAX_THREADS, &max_threads);
get_h2_num_workers = APR_RETRIEVE_OPTIONAL_FN(http2_get_num_workers);
if (get_h2_num_workers) {
get_h2_num_workers(s, &minw, &maxw);
- if (max_threads < maxw) {
- max_threads = maxw;
- }
+ /* So now the max is:
+ * max_threads-1 threads for HTTP/1 each requiring one connection
+ * + one thread for HTTP/2 requiring maxw connections
+ */
+ max_threads = max_threads - 1 + maxw;
}
if (max_threads > 1) {
/* Default hmax is max_threads to scale with the load and never