mirror of
https://github.com/php/php-src.git
synced 2024-11-28 04:14:26 +08:00
Apache does a full load, unload, load cycle for each DSO module.
This patch makes sure that any startup actions that are performed for PHP don't happen until the second load (the second call to the post_config hook), and it also prevents subsequent calls to the initialization routines. Suggested By: Cliff Woolley PR: 16475, 16754
This commit is contained in:
parent
3460eedfca
commit
b2f9b6fb16
@ -447,6 +447,23 @@ static int
|
||||
php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog,
|
||||
apr_pool_t *ptemp, server_rec *s)
|
||||
{
|
||||
void *data = NULL;
|
||||
const char *userdata_key = "apache2filter_post_config";
|
||||
|
||||
/* Apache will load, unload and then reload a DSO module. This
|
||||
* prevents us from starting PHP until the second load. */
|
||||
apr_pool_userdata_get(&data, userdata_key, s->process->pool);
|
||||
if (data == NULL) {
|
||||
apr_pool_userdata_setn((const void *)1, userdata_key,
|
||||
apr_pool_cleanup_null, s->process->pool);
|
||||
return OK;
|
||||
}
|
||||
else if (data == (const void *)2) {
|
||||
return OK;
|
||||
}
|
||||
apr_pool_userdata_setn((const void *)2, userdata_key,
|
||||
apr_pool_cleanup_null, s->process->pool);
|
||||
|
||||
/* Set up our overridden path. */
|
||||
if (apache2_php_ini_path_override) {
|
||||
apache2_sapi_module.php_ini_path_override = apache2_php_ini_path_override;
|
||||
|
Loading…
Reference in New Issue
Block a user