Merge from cli.

diff --git a/sapi/cgi/cgi_main.c b/sapi/cgi/cgi_main.c
index 7bb0b7dbbae6b6e7f42c7bc9e5be3190cf61b1f1..f142426ebbdc04d6e3cdb22732093e40b5ed07fe 100644 (file)
--- a/sapi/cgi/cgi_main.c
+++ b/sapi/cgi/cgi_main.c
@@ -1020,11 +1020,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;