diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 11:30:20 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2019-06-05 11:30:20 +0200 |
| commit | 21947e37a2f1cf80426f9c0804944bf44d53af73 (patch) | |
| tree | aeb014bffeef3064480a12df566928d66b335039 | |
| parent | 6a0a091333219dd192621b15edd7c93ec59fbe3c (diff) | |
| parent | 9cf6a5413a563b0c174a6cb4974bfd0795ce43e4 (diff) | |
| download | php-git-21947e37a2f1cf80426f9c0804944bf44d53af73.tar.gz | |
Merge branch 'PHP-7.4'
| -rw-r--r-- | ext/mysqli/mysqli_nonapi.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ext/mysqli/mysqli_nonapi.c b/ext/mysqli/mysqli_nonapi.c index 3ffa8d05dd..d6c474b7f3 100644 --- a/ext/mysqli/mysqli_nonapi.c +++ b/ext/mysqli/mysqli_nonapi.c @@ -58,6 +58,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne size_t hostname_len = 0, username_len = 0, passwd_len = 0, dbname_len = 0, socket_len = 0; zend_bool persistent = FALSE; zend_long port = 0, flags = 0; + zend_bool port_is_null = 1; zend_string *hash_key = NULL; zend_bool new_connection = FALSE; zend_resource *le; @@ -80,8 +81,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne hostname = username = dbname = passwd = socket = NULL; if (!is_real_connect) { - if (zend_parse_parameters(ZEND_NUM_ARGS(), "|ssssls", &hostname, &hostname_len, &username, &username_len, - &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len) == FAILURE) { + if (zend_parse_parameters(ZEND_NUM_ARGS(), "|s!s!s!s!l!s!", &hostname, &hostname_len, &username, &username_len, + &passwd, &passwd_len, &dbname, &dbname_len, &port, &port_is_null, &socket, &socket_len) == FAILURE) { return; } @@ -98,9 +99,8 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne flags |= CLIENT_MULTI_RESULTS; /* needed for mysql_multi_query() */ } else { /* We have flags too */ - if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|sssslsl", &object, mysqli_link_class_entry, - &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &socket, &socket_len, - &flags) == FAILURE) { + if (zend_parse_method_parameters(ZEND_NUM_ARGS(), getThis(), "O|s!s!s!s!l!s!l", &object, mysqli_link_class_entry, + &hostname, &hostname_len, &username, &username_len, &passwd, &passwd_len, &dbname, &dbname_len, &port, &port_is_null, &socket, &socket_len, &flags) == FAILURE) { return; } @@ -121,7 +121,7 @@ void mysqli_common_connect(INTERNAL_FUNCTION_PARAMETERS, zend_bool is_real_conne if (!socket_len || !socket) { socket = MyG(default_socket); } - if (!port){ + if (port_is_null || !port) { port = MyG(default_port); } if (!passwd) { |