Preserve exit status for non-php execution modes.

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 06e66537332090e9dc0c82182ead10bb638a8b11..5fd134eaee9d511a5fb1ccb6848fd278798a110b 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1614,7 +1614,9 @@ fastcgi_request_done:
                        }
 
                        php_request_shutdown((void *) 0);
-                       exit_status = EG(exit_status);
+                       if (exit_status == 0) {
+                               exit_status = EG(exit_status);
+                       }
 
                        if (SG(request_info).path_translated) {
                                free(SG(request_info).path_translated);

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 8291cee0de2b060715c7eb019256ef17f1c2e9cc..55d00d8c402e344978df9e28d9ad05ce9ab53155 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -1013,7 +1013,9 @@ int main(int argc, char *argv[])
 
 out:
        php_request_shutdown((void *) 0);
-       exit_status = EG(exit_status);
+       if (exit_status == 0) {
+               exit_status = EG(exit_status);
+       }
 out_err:       
        if (module_started) {
                php_module_shutdown(TSRMLS_C);