Merge branch 'PHP-7.3' into PHP-7.4

* PHP-7.3:
  Fix #78189: file cache strips last character of uname hash

diff --cc ext/opcache/zend_file_cache.c
index 231affedf328ef2f96884bb5739a5530c24529c6,907a7faeaccc1e47d807f99e8bd32c5db665f5d3..31f7e20cd62e269d1cbf1fdeefc22e6f37891762
--- 1/ext/opcache/zend_file_cache.c
--- 2/ext/opcache/zend_file_cache.c
+++ b/ext/opcache/zend_file_cache.c
@@@ -856,10 -778,10 +856,10 @@@ static char *zend_file_cache_get_bin_fi
        memcpy(filename, ZCG(accel_directives).file_cache, len);
        filename[len] = '\\';
        memcpy(filename + 1 + len, md5uname, 32);
-       len += 32;
+       len += 1 + 32;
        filename[len] = '\\';
  
 -      memcpy(filename + len + 1, ZCG(system_id), 32);
 +      memcpy(filename + len + 1, accel_system_id, 32);
  
        if (ZSTR_LEN(script_path) >= 7 && ':' == ZSTR_VAL(script_path)[4] && '/' == ZSTR_VAL(script_path)[5]  && '/' == ZSTR_VAL(script_path)[6]) {
                /* phar:// or file:// */