clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 18:37:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #78790: mysqli_get_client_info() expects exactly 0 parameters, 1 given

Browse Source 
Although the `mysqli` parameter is unused, it had been accepted so far,
and the documentation even claims that parameter would be required.  To
not break BC, we allow it again.
This commit is contained in:
Christoph M. Becker 2019-12-30 16:18:46 +01:00
parent e1b57310b1
commit 55fd97c576
3 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ext/mysqli/mysqli_api.c
View File

@ -1374,8 +1374,16 @@ PHP_FUNCTION(mysqli_free_result)
Get MySQL client info */
PHP_FUNCTION(mysqli_get_client_info)
{
if (zend_parse_parameters_none() == FAILURE) {
return;
if (getThis()) {
if (zend_parse_parameters_none() == FAILURE) {
return;
}
} else {
zval *mysql_link;
if (zend_parse_parameters(ZEND_NUM_ARGS(), "|O", &mysql_link, mysqli_link_class_entry) == FAILURE) {
return;
}
}
const char * info = mysql_get_client_info();

6
ext/mysqli/mysqli_fe.c
View File

@ -74,6 +74,10 @@ ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_only_link, 0, 0, 1)
MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_optional_link, 0, 0, 0)
MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
ZEND_END_ARG_INFO()
ZEND_BEGIN_ARG_INFO_EX(arginfo_mysqli_autocommit, 0, 0, 2)
MYSQLI_ZEND_ARG_OBJ_INFO_LINK()
ZEND_ARG_INFO(0, mode)
@ -445,7 +449,7 @@ const zend_function_entry mysqli_functions[] = {
#ifdef HAVE_MYSQLI_GET_CHARSET
PHP_FE(mysqli_get_charset, arginfo_mysqli_only_link)
#endif
PHP_FE(mysqli_get_client_info, arginfo_mysqli_no_options)
PHP_FE(mysqli_get_client_info, arginfo_mysqli_optional_link)
PHP_FE(mysqli_get_client_version, arginfo_mysqli_no_options)
PHP_FE(mysqli_get_links_stats, arginfo_mysqli_no_options)
PHP_FE(mysqli_get_host_info, arginfo_mysqli_only_link)

2
ext/mysqli/tests/bug74737.phpt
View File

@ -13,5 +13,5 @@ echo PHP_EOL;
echo $rf->getNumberOfRequiredParameters();
?>
--EXPECT--
0
1
0