Merge branch 'PHP-7.2' into PHP-7.3

* PHP-7.2:
  Fix checksum calculation for opcache

diff --cc NEWS
Simple merge

diff --cc ext/opcache/zend_accelerator_util_funcs.c
Simple merge

diff --cc ext/opcache/zend_accelerator_util_funcs.h
Simple merge

diff --cc ext/opcache/zend_file_cache.c
index 907a7faeaccc1e47d807f99e8bd32c5db665f5d3,dcf8ea9fa0a8acd1abb674823beb7faec148161d..ac6f84b7d1d92a46e71b578981a1802e596de6c5
--- 1/ext/opcache/zend_file_cache.c
--- 2/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@@ -1440,9 -1459,9 +1441,9 @@@ zend_persistent_script *zend_file_cache
  
        /* verify checksum */
        if (ZCG(accel_directives).file_cache_consistency_checks &&
-           zend_adler32(ADLER32_INIT, mem, info.mem_size + info.str_size) != info.checksum) {
-               zend_accel_error(ACCEL_LOG_WARNING, "corrupted file '%s'\n", filename);
+           (actual_checksum = zend_adler32(ADLER32_INIT, mem, info.mem_size + info.str_size)) != info.checksum) {
+               zend_accel_error(ACCEL_LOG_WARNING, "corrupted file '%s' excepted checksum: 0x%08x actual checksum: 0x%08x\n", filename, info.checksum, actual_checksum);
 -              unlink(filename);
 +              zend_file_cache_unlink(filename);
                zend_arena_release(&CG(arena), checkpoint);
                efree(filename);
                return NULL;