Use a sapi config instead

Author: danog

Zend/zend_portability.h

@@ -164,8 +164,12 @@
 
 # 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) && (!defined(LM_ID_NEWLM) || defined(PHP_USE_RTLD_DEEPBIND))
-#  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
+# elif defined(RTLD_DEEPBIND) && !defined(__SANITIZE_ADDRESS__) && !__has_feature(memory_sanitizer)
+#  if defined(LM_ID_NEWLM)
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | (sapi_module.isolate_symbols ? RTLD_DEEPBIND : 0))
+#  else
+#    define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL | RTLD_DEEPBIND)
+#  endif
 # else
 #  define DL_LOAD(libname)			dlopen(libname, PHP_RTLD_MODE | RTLD_GLOBAL)
 # endif

main/SAPI.h

@@ -287,6 +287,8 @@ struct _sapi_module_struct {
 	const char *ini_entries;
 	const zend_function_entry *additional_functions;
 	unsigned int (*input_filter_init)(void);
+
+	bool isolate_symbols;
 };
 
 struct _sapi_post_entry {
@@ -337,6 +339,7 @@ END_EXTERN_C()
 	0,    /* phpinfo_as_text;        */ \
 	NULL, /* ini_entries;            */ \
 	NULL, /* additional_functions    */ \
-	NULL  /* input_filter_init       */
+	NULL, /* input_filter_init       */ \
+	false /* isolate_symbols         */
 
 #endif /* SAPI_H */

sapi/apache2handler/config.m4

@@ -7,7 +7,6 @@ PHP_ARG_WITH([apxs2],
   [no])
 
 if test "$PHP_APXS2" != "no"; then
-  AC_DEFINE(PHP_USE_RTLD_DEEPBIND, 1, [ Use dlopen with RTLD_DEEPBIND instead of delegating isolation to the user via dlmopen ])
   AS_VAR_IF([PHP_APXS2], [yes], [
     APXS=apxs
     $APXS -q CFLAGS >/dev/null 2>&1

sapi/apache2handler/sapi_apache2.c

@@ -415,7 +415,23 @@ static sapi_module_struct apache2_sapi_module = {
 	php_apache_sapi_get_request_time,		/* Request Time */
 	NULL,						/* Child Terminate */
 
-	STANDARD_SAPI_MODULE_PROPERTIES
+	NULL, /* php_ini_path_override   */
+	NULL, /* default_post_reader     */
+	NULL, /* treat_data              */
+	NULL, /* executable_location     */
+	0,    /* php_ini_ignore          */
+	0,    /* php_ini_ignore_cwd      */
+	NULL, /* get_fd                  */
+	NULL, /* force_http_10           */
+	NULL, /* get_target_uid          */
+	NULL, /* get_target_gid          */
+	NULL, /* input_filter            */
+	NULL, /* ini_defaults            */
+	0,    /* phpinfo_as_text;        */
+	NULL, /* ini_entries;            */
+	NULL, /* additional_functions    */
+	NULL, /* input_filter_init       */
+	true /* isolate_symbols         */
 };
 
 static apr_status_t php_apache_server_shutdown(void *tmp)