From: Ilia Alshanetsky <iliaa@php.net>
Date: Fri, 1 Aug 2003 16:53:03 +0000 (+0000)
Subject: MFH: Preserve exit status for non-php execution modes.
X-Git-Tag: php-4.3.3RC3~42
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=85f4e2b19142c44d90c80978d767173eb6a4e4c5;p=php

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

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 575b1be6a1..281951ec42 100644
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1540,7 +1540,6 @@ consult the installation file that came with this distribution, or visit \n\
 		switch (behavior) {
 			case PHP_MODE_STANDARD:
 				php_execute_script(&file_handle TSRMLS_CC);
-				exit_status = EG(exit_status);
 				break;
 			case PHP_MODE_LINT:
 				PG(during_request_startup) = 0;
@@ -1597,7 +1596,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 3b0e1a931c..42b935f834 100644
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -869,7 +869,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);