archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source 
* PHP-8.2:
  Fix implicit/explicit port in mysqlnd

Closes GH-11990
This commit is contained in:
Kamil Tekiela 2023-08-16 20:34:33 +01:00
commit 7e4ca2e8d9
No known key found for this signature in database
GPG key ID: 0760BDAB1E89A1E3
4 changed files with 40 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
ext/mysqlnd/mysqlnd_commands.c
View file

@ -542,6 +542,8 @@ MYSQLND_METHOD(mysqlnd_command, enable_ssl)(MYSQLND_CONN_DATA * const conn, cons
conn->vio->data->m.set_client_option(conn->vio, MYSQL_OPT_SSL_VERIFY_SERVER_CERT, (const char *) &verify);
if (FAIL == conn->vio->data->m.enable_ssl(conn->vio)) {
SET_CONNECTION_STATE(&conn->state, CONN_QUIT_SENT);
SET_CLIENT_ERROR(conn->error_info, CR_CONNECTION_ERROR, UNKNOWN_SQLSTATE, "Cannot connect to MySQL using SSL");
goto end;
}
}