From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 29 Jul 2019 14:57:57 +0000 (+0200)
Subject: Merge branch 'PHP-7.2' into PHP-7.3
X-Git-Tag: php-7.4.0beta2~26^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=bbed5564eb8155efb14146e11ef0ad67edb20e28;p=php

Merge branch 'PHP-7.2' into PHP-7.3
---

bbed5564eb8155efb14146e11ef0ad67edb20e28
diff --cc ext/opcache/ZendAccelerator.c
index 90397bf8d7,58016ce191..80f94eaf28
--- a/ext/opcache/ZendAccelerator.c
+++ b/ext/opcache/ZendAccelerator.c
@@@ -1706,8 -1569,10 +1706,10 @@@ static zend_persistent_script *opcache_
      }
  
  	/* check blacklist right after ensuring that file was opened */
 -	if (file_handle->opened_path && zend_accel_blacklist_is_blacklisted(&accel_blacklist, ZSTR_VAL(file_handle->opened_path))) {
 +	if (file_handle->opened_path && zend_accel_blacklist_is_blacklisted(&accel_blacklist, ZSTR_VAL(file_handle->opened_path), ZSTR_LEN(file_handle->opened_path))) {
+ 		SHM_UNPROTECT();
  		ZCSG(blacklist_misses)++;
+ 		SHM_PROTECT();
  		*op_array_p = accelerator_orig_compile_file(file_handle, type);
  		return NULL;
  	}