From: Dmitry Stogov Date: Wed, 16 Nov 2016 20:09:13 +0000 (+0300) Subject: Merge branch 'PHP-7.0' into PHP-7.1 X-Git-Tag: php-7.2.0alpha1~917^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=cd3527baee7fa200c35997fb11504e840e3a8fd2;p=php Merge branch 'PHP-7.0' into PHP-7.1 * PHP-7.0: Use full path --- cd3527baee7fa200c35997fb11504e840e3a8fd2 diff --cc ext/opcache/ZendAccelerator.c index 9b6734fb49,11724c4eda..f6d2ed031a --- a/ext/opcache/ZendAccelerator.c +++ b/ext/opcache/ZendAccelerator.c @@@ -1775,7 -1767,7 +1775,7 @@@ zend_op_array *persistent_compile_file( if (EXPECTED(persistent_script != NULL) && UNEXPECTED(ZCG(accel_directives).validate_permission) && file_handle->type == ZEND_HANDLE_FILENAME && - UNEXPECTED(access(file_handle->filename, R_OK) != 0)) { - UNEXPECTED(access(ZSTR_VAL(persistent_script->full_path), R_OK) != 0)) { ++ UNEXPECTED(access(ZSTR_VAL(persistent_script->script.filename), R_OK) != 0)) { if (type == ZEND_REQUIRE) { zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename TSRMLS_CC); zend_bailout();