Skip to content

Fix GH-20528: Regression breaks mysql connexion using an IPv6 address… #20536

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: PHP-8.3
Choose a base branch
from
+45 −3
Open

Fix GH-20528: Regression breaks mysql connexion using an IPv6 address… #20536

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
21a1fc0
Fix GH-20528: Regression breaks mysql connexion using an IPv6 address…
remicollet Nov 20, 2025
5488876
add IPv6 address enclosed in square brackets
remicollet Nov 20, 2025
30dcff2
add test to connect using host:port
remicollet Nov 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions ext/mysqli/tests/mysqli_connect_port.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
--TEST--
mysqli_connect() with port in host
--EXTENSIONS--
mysqli
--SKIPIF--
<?php
require_once 'skipifconnectfailure.inc';
?>
--FILE--
<?php
require_once 'connect.inc';

// using port / host arguments
if (!$link = mysqli_connect($host, $user, $passwd, $db, $port, $socket)) {
printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
$host, $user, $db, $port, $socket);
}

mysqli_close($link);

// using port in host
if (!$link = mysqli_connect("$host:$port", $user, $passwd, $db, "1$port", $socket)) {
printf("Cannot connect to the server using host=%s, user=%s, passwd=***, dbname=%s, port=%s, socket=%s\n",
"$host:$port", $user, $db, "1$port", $socket);
}

mysqli_close($link);
?>
Done
--EXPECTF--
Done
17 changes: 14 additions & 3 deletions ext/mysqlnd/mysqlnd_connection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -553,13 +553,24 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_scheme)(MYSQLND_CONN_DATA * conn, MYSQLND_
port = 3306;
}

/* ipv6 addresses are in the format [address]:port */
if (hostname.s[0] != '[' && mysqlnd_fast_is_ipv6_address(hostname.s)) {
/* IPv6 without square brackets so without port */
transport.l = mnd_sprintf(&transport.s, 0, "tcp://[%s]:%u", hostname.s, port);
} else {
/* Not ipv6, but could already contain a port number, in which case we should not add an extra port.
char *p;

/* IPv6 addresses are in the format [address]:port */
if (hostname.s[0] == '[') { /* IPv6 */
Copy link

@EdouardCourty EdouardCourty Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Add a unit test covering this logic

Copy link
Member Author

@remicollet remicollet Nov 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not so easy, $host is inherited from env MYSQL_TEST_HOST

p = strchr(hostname.s, ']');
if (p && p[1] != ':') {
p = NULL;
}
} else { /* IPv4 or name */
p = strchr(hostname.s, ':');
}
/* Could already contain a port number, in which case we should not add an extra port.
* See GH-8978. In a port doubling scenario, the first port would be used so we do the same to keep BC. */
if (strchr(hostname.s, ':')) {
if (p) {
/* TODO: Ideally we should be able to get rid of this workaround in the future. */
transport.l = mnd_sprintf(&transport.s, 0, "tcp://%s", hostname.s);
} else {
Expand Down
Loading