mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 18:34:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix CLI test and drop some now unnecessary code

Browse Source
This commit is contained in:
Nikita Popov 2015-03-09 14:08:01 +01:00
parent 1c94ff0595
commit b0055678bf
2 changed files with 6 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
main/main.c
View File

@ -1186,29 +1186,11 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
case E_PARSE:
case E_COMPILE_ERROR:
case E_USER_ERROR:
{ /* new block to allow variable definition */
/* eval() errors do not affect exit_status or response code */
zend_bool during_eval = 0;
if (type == E_PARSE) {
zend_execute_data *execute_data = EG(current_execute_data);
while (execute_data && (!execute_data->func || !ZEND_USER_CODE(execute_data->func->common.type))) {
execute_data = execute_data->prev_execute_data;
}
during_eval = (execute_data &&
execute_data->opline->opcode == ZEND_INCLUDE_OR_EVAL &&
execute_data->opline->extended_value == ZEND_EVAL);
}
if (!during_eval) {
EG(exit_status) = 255;
}
EG(exit_status) = 255;
if (module_initialized) {
if (!PG(display_errors) &&
!SG(headers_sent) &&
SG(sapi_headers).http_response_code == 200 &&
!during_eval
SG(sapi_headers).http_response_code == 200
) {
sapi_header_line ctr = {0};
@ -1229,7 +1211,6 @@ static void php_error_cb(int type, const char *error_filename, const uint error_
}
}
break;
}
}
/* Log if necessary */

5
sapi/cli/tests/bug43177.phpt
View File

@ -11,7 +11,10 @@ php_cli_server_start(<<<'SCRIPT'
ini_set('display_errors', 0);
switch($_SERVER["REQUEST_URI"]) {
case "/parse":
eval("this is a parse error");
try {
eval("this is a parse error");
} catch (ParseException $e) {
}
echo "OK\n";
break;
case "/fatal":