From 7a34aa7feb03b8574019962b7133c51ecb4fa8df Mon Sep 17 00:00:00 2001 From: David Carlier Date: Fri, 12 Jul 2024 12:58:10 +0100 Subject: [PATCH] sapi/apache: AP_MPMQ_MAX_THREADS is always available. since we upgraded the minimum with 2.4, AP_MPMQ_MAX_THREADS is always available (since 2.3) and all MPM return a value, including prefork. --- sapi/apache2handler/sapi_apache2.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/sapi/apache2handler/sapi_apache2.c b/sapi/apache2handler/sapi_apache2.c index 67dedf703d351..1d85a92ebf4d8 100644 --- a/sapi/apache2handler/sapi_apache2.c +++ b/sapi/apache2handler/sapi_apache2.c @@ -486,13 +486,9 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp } #ifdef ZTS int expected_threads; -#ifdef AP_MPMQ_MAX_THREADS if (ap_mpm_query(AP_MPMQ_MAX_THREADS, &expected_threads) != APR_SUCCESS) { expected_threads = 1; } -#else - expected_threads = 1; -#endif php_tsrm_startup_ex(expected_threads); # ifdef PHP_WIN32