From: Christoph M. Becker <cmbecker69@gmx.de>
Date: Thu, 20 Jun 2019 16:01:02 +0000 (+0200)
Subject: Merge branch 'PHP-7.3' into PHP-7.4
X-Git-Tag: php-7.4.0alpha2~23
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2b4fc9eb9c0e0b607dfb0bf779936507be1ad58b;p=php

Merge branch 'PHP-7.3' into PHP-7.4

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

2b4fc9eb9c0e0b607dfb0bf779936507be1ad58b
diff --cc ext/opcache/zend_file_cache.c
index 231affedf3,907a7faeac..31f7e20cd6
--- a/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:// */