Fix a graceful restart SEGV. We no longer only perform initialization

on the second pass through the post_config. Now we only avoid the
initialization only on the first DSO load, and on all subsequent loads
we rerun the init code.

diff --git a/sapi/apache2filter/sapi_apache2.c b/sapi/apache2filter/sapi_apache2.c
index 81f3fd6d0ef879b625e83713f9ede4f63942b7e6..4bd2a5214662dd6ba79b8d3d0b51d39b01a52fc7 100644 (file)
--- a/sapi/apache2filter/sapi_apache2.c
+++ b/sapi/apache2filter/sapi_apache2.c
@@ -463,11 +463,6 @@ php_apache_server_startup(apr_pool_t *pconf, apr_pool_t *plog,
                                                          apr_pool_cleanup_null, s->process->pool);
                return OK;
        }
-       else if (data == (const void *)2) {
-               return OK;
-       }
-       apr_pool_userdata_set((const void *)2, userdata_key,
-                                                  apr_pool_cleanup_null, s->process->pool);
 
        /* Set up our overridden path. */
        if (apache2_php_ini_path_override) {