MFH (fix for exit())

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 667007cd3e15980fb5d0f4b6bb426d8d9934fe1f..b50e1ffa13c184b045e04b7f8bbdc4e18aa5eabf 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -775,11 +775,8 @@ consult the installation file that came with this distribution, or visit \n\
 
                switch (behavior) {
                        case PHP_MODE_STANDARD:
-                               if (php_execute_script(&file_handle TSRMLS_CC)) {
-                                       exit_status = EG(exit_status);
-                               } else {
-                                       exit_status = 255;
-                               }
+                               php_execute_script(&file_handle TSRMLS_CC);
+                               exit_status = EG(exit_status);
                                break;
                        case PHP_MODE_LINT:
                                PG(during_request_startup) = 0;

diff --git a/sapi/cli/php_cli.c b/sapi/cli/php_cli.c
index 1b1da66b42c2d281a9be76cdce6ca39df88219fe..115902b73731ad9cd00298382d36155236a0b1c0 100644 (file)
--- a/sapi/cli/php_cli.c
+++ b/sapi/cli/php_cli.c
@@ -585,11 +585,8 @@ int main(int argc, char *argv[])
 
                switch (behavior) {
                case PHP_MODE_STANDARD:
-                       if (php_execute_script(&file_handle TSRMLS_CC)) {
-                               exit_status = EG(exit_status);
-                       } else {
-                               exit_status = 255;
-                       }
+                       php_execute_script(&file_handle TSRMLS_CC);
+                       exit_status = EG(exit_status);
                        break;
                case PHP_MODE_LINT:
                        PG(during_request_startup) = 0;