From: Anatol Belski <ab@php.net>
Date: Mon, 21 Nov 2016 23:32:42 +0000 (+0100)
Subject: Merge branch 'PHP-7.0' into PHP-7.1
X-Git-Tag: php-7.1.1RC1~212
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d61db8d6020b2f07d8beb681c9895bb4e5418e46;p=php

Merge branch 'PHP-7.0' into PHP-7.1

* PHP-7.0:
  remove TSRMLS_*
---

d61db8d6020b2f07d8beb681c9895bb4e5418e46
diff --cc ext/opcache/ZendAccelerator.c
index 0a2304bbc9,8844da6d59..8f936bb5e0
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1775,12 -1767,12 +1775,12 @@@ 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(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_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle->filename);
  			zend_bailout();
  		} else {
- 			zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename TSRMLS_CC);
+ 			zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle->filename);
  		}
  		return NULL;
  	}