Close all observer end handlers before shutdown functions

Also update observed frame arena size

Author: SammyK

Zend/zend_observer.c

@@ -82,8 +82,7 @@ ZEND_API void zend_observer_startup(void) {
 ZEND_API void zend_observer_activate(void) {
 	if (ZEND_OBSERVER_ENABLED) {
 		fcall_handlers_arena = zend_arena_create(4096);
-		// TODO: How big should the arena be?
-		observed_stack_arena = zend_arena_create(2048);
+		observed_stack_arena = zend_arena_create(4096);
 	}
 }
 

main/main.c

@@ -1747,16 +1747,16 @@ 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();
 	}
 
-	/* 1.5. Call any open end handlers that are still open after a zend_bailout */
-	if (ZEND_OBSERVER_ENABLED) {
-		zend_observer_fcall_end_all();
-	}
-
 	/* 2. Call all possible __destruct() functions */
 	zend_try {
 		zend_call_destructors();