From: Aaron Bannert <aaron@php.net>
Date: Sun, 5 May 2002 18:15:33 +0000 (+0000)
Subject: Fix a graceful restart SEGV. We no longer only perform initialization
X-Git-Tag: php-4.3.0dev-ZendEngine2-Preview1~217
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8e176a10fc61d60eb279ea662b050b247faf2d3f;p=php

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 81f3fd6d0e..4bd2a52146 100644
--- 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) {