Cleanup

Author: danog

Zend/zend_portability.h

@@ -162,13 +162,11 @@
 #  define PHP_RTLD_MODE  RTLD_LAZY
 # endif
 
-/* True global */
-static bool use_deepbind = false;
-
 # if defined(RTLD_GROUP) && defined(RTLD_WORLD) && defined(RTLD_PARENT)
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_GROUP | RTLD_WORLD | RTLD_PARENT)
 # elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
 #  if defined(LM_ID_NEWLM)
+     extern bool use_deepbind;
 #    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (use_deepbind ? RTLD_DEEPBIND : 0))
 #  else
 #    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)

main/main.c

@@ -845,6 +845,8 @@ static bool module_initialized = false;
 static bool module_startup = true;
 static bool module_shutdown = false;
 
+bool use_deepbind = false;
+
 /* {{{ php_during_module_startup */
 PHPAPI bool php_during_module_startup(void)
 {

sapi/apache2handler/sapi_apache2.c

@@ -415,7 +415,7 @@ static sapi_module_struct apache2_sapi_module = {
 	php_apache_sapi_get_request_time,		/* Request Time */
 	NULL,						/* Child Terminate */
 
-	STANDARD_SAPI_MODULE_PROPERTIES_WITH_FLAGS(SAPI_MODULE_FLAG_ISOLATE_SYMBOLS)
+	STANDARD_SAPI_MODULE_PROPERTIES
 };
 
 static apr_status_t php_apache_server_shutdown(void *tmp)
@@ -461,11 +461,14 @@ static int php_pre_config(apr_pool_t *pconf, apr_pool_t *plog, apr_pool_t *ptemp
 	return OK;
 }
 
+extern bool use_deepbind;
+
 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 = "apache2hook_post_config";
+	use_deepbind = true;
 
 	/* Apache will load, unload and then reload a DSO module. This
 	 * prevents us from starting PHP until the second load. */