Merge branch 'PHP-7.4'

kocsismate · kocsismate · commit d6a6a60ef90e · 2020-01-27T14:04:19.000+01:00
diff --git a/ext/standard/password.c b/ext/standard/password.c
@@ -424,7 +424,7 @@ const php_password_algo php_password_algo_argon2id = {
 PHP_MINIT_FUNCTION(password) /* {{{ */
 {
 	zend_hash_init(&php_password_algos, 4, NULL, ZVAL_PTR_DTOR, 1);
-	REGISTER_NULL_CONSTANT("PASSWORD_DEFAULT", CONST_CS | CONST_PERSISTENT);
+	REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_CS | CONST_PERSISTENT);
 
 	if (FAILURE == php_password_algo_register("2y", &php_password_algo_bcrypt)) {
 		return FAILURE;
diff --git a/ext/standard/tests/password/password_default.phpt b/ext/standard/tests/password/password_default.phpt
@@ -0,0 +1,9 @@
+--TEST--
+Test that the value of PASSWORD_DEFAULT matches PASSWORD_BCRYPT
+--FILE--
+<?php
+echo PASSWORD_DEFAULT . "\n";
+echo PASSWORD_BCRYPT . "\n";
+--EXPECT--
+2y
+2y

Original file line number	Diff line number	Diff line change
`@@ -424,7 +424,7 @@ const php_password_algo php_password_algo_argon2id = {`
`424`	`424`	`PHP_MINIT_FUNCTION(password) /* {{{ */`
`425`	`425`	`{`
`426`	`426`	`zend_hash_init(&php_password_algos, 4, NULL, ZVAL_PTR_DTOR, 1);`
`427`		`- REGISTER_NULL_CONSTANT("PASSWORD_DEFAULT", CONST_CS \| CONST_PERSISTENT);`
	`427`	`+ REGISTER_STRING_CONSTANT("PASSWORD_DEFAULT", "2y", CONST_CS \| CONST_PERSISTENT);`
`428`	`428`
`429`	`429`	`if (FAILURE == php_password_algo_register("2y", &php_password_algo_bcrypt)) {`
`430`	`430`	`return FAILURE;`