com php-src: Revert "Fix logical-op-parentheses warning": ext/opcache/ZendAccelerator.c

From: Date: Fri, 06 Mar 2015 07:56:19 +0000
Subject: com php-src: Revert "Fix logical-op-parentheses warning": ext/opcache/ZendAccelerator.c
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-85287@lists.php.net to get a copy of this message
Commit: 8308e617f112a6fac048020793cde4675d83b962 Author: Dmitry Stogov <dmitry@zend.com> Fri, 6 Mar 2015 10:56:19 +0300 Parents: eef261f0e47ed37d5dbbb3c0366cd9c481473dd8 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=8308e617f112a6fac048020793cde4675d83b962 Log: Revert "Fix logical-op-parentheses warning" This reverts commit b7408234b9d9846d69d4557aa1850f5dc4622d1a. Changed paths: M ext/opcache/ZendAccelerator.c Diff: diff --git a/ext/opcache/ZendAccelerator.c b/ext/opcache/ZendAccelerator.c index 0265106..c5064af 100644 --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@ -1470,10 +1470,10 @@ zend_op_array *persistent_compile_file(zend_file_handle *file_handle, int type) /* In case this callback is called from include_once, require_once or it's * a main FastCGI request, the key must be already calculated, and cached * persistent script already found */ - if ((ZCG(cache_persistent_script) && ZCG(key_len) && + if (ZCG(cache_persistent_script) && ZCG(key_len) && (!EG(current_execute_data) && file_handle->filename == SG(request_info).path_translated && - ZCG(cache_opline) == NULL)) || + ZCG(cache_opline) == NULL) || (EG(current_execute_data) && EG(current_execute_data)->func && ZEND_USER_CODE(EG(current_execute_data)->func->common.type) && @@ -1702,9 +1702,9 @@ static zend_string* persistent_zend_resolve_path(const char *filename, int filen !ZCSG(restart_in_progress)) { /* check if callback is called from include_once or it's a main request */ - if ((!ZCG(accel_directives).revalidate_path && + if (!ZCG(accel_directives).revalidate_path && (!EG(current_execute_data) && - filename == SG(request_info).path_translated)) || + filename == SG(request_info).path_translated) || (EG(current_execute_data) && EG(current_execute_data)->func && ZEND_USER_CODE(EG(current_execute_data)->func->common.type) &&

« previous php.cvs (#85287) next »