move call to php_execute_pre_request_shutdown() into php_request_shutdown()

so it will be called when script terminated due to call to exit().

diff --git a/main/main.c b/main/main.c
index bf574efe32554a6d8ffb99d7e9f0a9f9f68b534f..c8a9a83c9f3dfd6b7b46b5d3f7b23a22f0aaa497 100644 (file)
--- a/main/main.c
+++ b/main/main.c
@@ -797,6 +797,8 @@ void php_request_shutdown(void *dummy)
        ELS_FETCH();
        SLS_FETCH();
 
+       php_execute_pre_request_shutdown(PLS_C);
+
        sapi_send_headers();
        php_end_ob_buffering(SG(request_info).headers_only?0:1);
 
@@ -1298,7 +1300,6 @@ PHPAPI void php_execute_script(zend_file_handle *primary_file CLS_DC ELS_DC PLS_
                EG(active_op_array) = EG(main_op_array);
                php_execute_post_request_startup(PLS_C);
                zend_execute(EG(main_op_array) ELS_CC);
-               php_execute_pre_request_shutdown(PLS_C);
        }
 }