diff options
| author | Nikita Popov <nikic@php.net> | 2015-03-09 14:08:01 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2015-03-09 14:09:34 +0100 |
| commit | b0055678bf53608f440d074d9acee49b03dabfc0 (patch) | |
| tree | 34396ad97b0348f42c08f95bbbdf3ac3fc67f1e0 /main | |
| parent | 1c94ff0595bbe6f3df8058aff7252bda09dc4a15 (diff) | |
| download | php-git-b0055678bf53608f440d074d9acee49b03dabfc0.tar.gz | |
Fix CLI test and drop some now unnecessary code
Diffstat (limited to 'main')
| -rw-r--r-- | main/main.c | 23 |
1 files changed, 2 insertions, 21 deletions
diff --git a/main/main.c b/main/main.c index ffbead83c8..14f86b0ad1 100644 --- a/main/main.c +++ b/main/main.c @@ -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 */ |