Merge branch 'master' of github.com:php/php-src

* 'master' of github.com:php/php-src:
  Use 16 instead of 15 bytes of random data in ReflectionReference->getId (#7148)
  Fix test wrt. OPENSSL_CONF

Author: krakjoe

ext/openssl/tests/check_default_conf_path.phpt

@@ -6,6 +6,8 @@ if (substr(PHP_OS, 0, 3) != 'WIN') {
     die('skip windows only test');
 }
 ?>
+--ENV--
+OPENSSL_CONF=
 --FILE--
 <?php
 

ext/reflection/php_reflection.c

@@ -6370,7 +6370,7 @@ ZEND_METHOD(ReflectionReference, getId)
 	}
 
 	if (!REFLECTION_G(key_initialized)) {
-		if (php_random_bytes_throw(&REFLECTION_G(key_initialized), 16) == FAILURE) {
+		if (php_random_bytes_throw(&REFLECTION_G(key), 16) == FAILURE) {
 			RETURN_THROWS();
 		}