cvs: php4(PHP_4_2_0) /sapi/cgi cgi_main.c /sapi/cli php_cli.c
| From: | Edin Kadribasic | Date: | Sun, 26 May 2002 21:16:32 +0000 |
| Subject: | cvs: php4(PHP_4_2_0) /sapi/cgi cgi_main.c /sapi/cli php_cli.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-12106@lists.php.net to get a copy of this message | ||
edink Sun May 26 17:16:32 2002 EDT
Modified files: (Branch: PHP_4_2_0)
/php4/sapi/cli php_cli.c
/php4/sapi/cgi cgi_main.c
Log:
MFH (fix for exit())
Index: php4/sapi/cli/php_cli.c
diff -u php4/sapi/cli/php_cli.c:1.7.2.3 php4/sapi/cli/php_cli.c:1.7.2.4
--- php4/sapi/cli/php_cli.c:1.7.2.3 Sun May 5 13:12:27 2002
+++ php4/sapi/cli/php_cli.c Sun May 26 17:16:31 2002
@@ -585,11 +585,8 @@
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;
Index: php4/sapi/cgi/cgi_main.c
diff -u php4/sapi/cgi/cgi_main.c:1.150.2.1 php4/sapi/cgi/cgi_main.c:1.150.2.2
--- php4/sapi/cgi/cgi_main.c:1.150.2.1 Thu May 2 13:20:41 2002
+++ php4/sapi/cgi/cgi_main.c Sun May 26 17:16:31 2002
@@ -775,11 +775,8 @@
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;