cvs: php4 /sapi/apache2filter sapi_apache2.c

aaron Sun May 5 14:15:34 2002 EDT Modified files: /php4/sapi/apache2filter sapi_apache2.c Log: 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. Index: php4/sapi/apache2filter/sapi_apache2.c diff -u php4/sapi/apache2filter/sapi_apache2.c:1.75 php4/sapi/apache2filter/sapi_apache2.c:1.76 --- php4/sapi/apache2filter/sapi_apache2.c:1.75 Sun May 5 14:11:41 2002 +++ php4/sapi/apache2filter/sapi_apache2.c Sun May 5 14:15:33 2002 @@ -463,11 +463,6 @@ 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) {