sapi/apache: AP_MPMQ_MAX_THREADS is always available. (#14934)

devnexen · web-flow · commit 0f398a437e40 · 2024-07-12T13:22:24.000+01:00
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.
diff --git 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

Original file line number	Diff line number	Diff line change
`@@ -486,13 +486,9 @@ php_apache_server_startup(apr_pool_t pconf, apr_pool_t plog, apr_pool_t *ptemp`
`486`	`486`	`}`
`487`	`487`	`#ifdef ZTS`
`488`	`488`	`int expected_threads;`
`489`		`-#ifdef AP_MPMQ_MAX_THREADS`
`490`	`489`	`if (ap_mpm_query(AP_MPMQ_MAX_THREADS, &expected_threads) != APR_SUCCESS) {`
`491`	`490`	`expected_threads = 1;`
`492`	`491`	`}`
`493`		`-#else`
`494`		`- expected_threads = 1;`
`495`		`-#endif`
`496`	`492`
`497`	`493`	`php_tsrm_startup_ex(expected_threads);`
`498`	`494`	`# ifdef PHP_WIN32`