]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.2' into PHP-7.3
authorNikita Popov <nikita.ppv@gmail.com>
Mon, 29 Jul 2019 14:57:57 +0000 (16:57 +0200)
committerNikita Popov <nikita.ppv@gmail.com>
Mon, 29 Jul 2019 14:57:57 +0000 (16:57 +0200)
1  2 
Zend/zend_signal.c
ext/opcache/ZendAccelerator.c
main/main.c

Simple merge
index 90397bf8d797a631053a1c5bddd7287ad1268ff1,58016ce191045c0c1f850dd56944e479834bbd5f..80f94eaf28f2ab894140009077de1ad8138f9e7a
@@@ -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;
        }
diff --cc main/main.c
Simple merge