From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 1 Aug 2003 16:52:49 +0000 (+0000)
Subject: Preserve exit status for non-php execution modes.
X-Git-Tag: BEFORE_ARG_INFO~20
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3253746c26c92b1fb3d4a5778073c8691eb8a81d;p=php

Preserve exit status for non-php execution modes.
---

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 06e6653733..5fd134eaee 100644
--- 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 8291cee0de..55d00d8c40 100644
--- 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);