Merge branch 'PHP-8.1'

* PHP-8.1:
  Disable zend_rc_debug during dtor of dl()'ed module (#8606)

Author: arnaud-lb

Zend/zend_API.c

@@ -2953,8 +2953,17 @@ static void clean_module_classes(int module_number) /* {{{ */
 
 void module_destructor(zend_module_entry *module) /* {{{ */
 {
+#if ZEND_RC_DEBUG
+	bool orig_rc_debug = zend_rc_debug;
+#endif
 
 	if (module->type == MODULE_TEMPORARY) {
+#if ZEND_RC_DEBUG
+		/* FIXME: Loading extensions during the request breaks some invariants.
+		 * In particular, it will create persistent interned strings, which is
+		 * not allowed at this stage. */
+		zend_rc_debug = false;
+#endif
 		zend_clean_module_rsrc_dtors(module->module_number);
 		clean_module_constants(module->module_number);
 		clean_module_classes(module->module_number);
@@ -2996,6 +3005,10 @@ void module_destructor(zend_module_entry *module) /* {{{ */
 		DL_UNLOAD(module->handle);
 	}
 #endif
+
+#if ZEND_RC_DEBUG
+	zend_rc_debug = orig_rc_debug;
+#endif
 }
 /* }}} */
 

ext/standard/dl.c

@@ -60,6 +60,9 @@ PHPAPI PHP_FUNCTION(dl)
 
 #if ZEND_RC_DEBUG
 	bool orig_rc_debug = zend_rc_debug;
+	/* FIXME: Loading extensions during the request breaks some invariants. In
+	 * particular, it will create persistent interned strings, which is not
+	 * allowed at this stage. */
 	zend_rc_debug = false;
 #endif