]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.0' into PHP-7.1
authorDmitry Stogov <dmitry@zend.com>
Wed, 16 Nov 2016 20:09:13 +0000 (23:09 +0300)
committerDmitry Stogov <dmitry@zend.com>
Wed, 16 Nov 2016 20:09:13 +0000 (23:09 +0300)
* PHP-7.0:
  Use full path

1  2 
ext/opcache/ZendAccelerator.c

index 9b6734fb49fb0984bc1bada79744e08551e94b13,11724c4eda359f4ecc200070a18fd7687140e84b..f6d2ed031ab4cbe37ae5877380203776f39c4dbd
@@@ -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();