diff options
| author | Sammy Kaye Powers <sammyk@php.net> | 2020-10-23 11:43:31 -0700 |
|---|---|---|
| committer | Sammy Kaye Powers <sammyk@php.net> | 2020-11-16 15:12:57 -0800 |
| commit | 0425a6697a21327880e36975c733bba2b6a6890a (patch) | |
| tree | db05b906b9822976260eab56971fe4a6e8c4f4a5 /main | |
| parent | 3fb1b0862c3742a1ef2d491ce8c9045bf2abc87c (diff) | |
| download | php-git-0425a6697a21327880e36975c733bba2b6a6890a.tar.gz | |
Fire open observer end handlers after a zend_bailout
Closes GH-6377
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/main/main.c b/main/main.c index 60fdb89efe..d2d19a5ee8 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(); |