delay module_shutdown even further. zend_try and _catch need the current

globals as well.
zeev, is this a chicken & egg problem?

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 723ec6aee0cc29acdc5284f8a81479f3394e6c22..52b9e6ccdd9c65a3dd49ac7c40f3aa498637ccc1 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -778,11 +778,12 @@ any .htaccess restrictions anywhere on your site you can leave doc_root undefine
                        free(cgi_sapi_module.php_ini_path_override);
                }
 
-               php_module_shutdown();
        } zend_catch {
                exit_status = -1;
        } zend_end_try();
 
+       php_module_shutdown();
+
 #ifdef ZTS
        tsrm_shutdown();
 #endif