Merge branch 'PHP-8.0'

* PHP-8.0:
  Fire open observer end handlers after a zend_bailout

1 files changed, 5 insertions, 0 deletions

diff --git a/main/main.c b/main/main.c
index 26ea0c549e..8ab7c55067 100644
--- a/main/main.c
+++ b/main/main.c
@@ -1740,6 +1740,11 @@ void php_request_shutdown(void *dummy)
 
 	php_deactivate_ticks();
 
+	/* 0. Call any open observer end handlers that are still open after a zend_bailout */
+	if (ZEND_OBSERVER_ENABLED) {
+		zend_observer_fcall_end_all();
+	}
+
 	/* 1. Call all possible shutdown functions registered with register_shutdown_function() */
 	if (PG(modules_activated)) {
 		php_call_shutdown_functions();