diff options
| author | Anatol Belski <ab@php.net> | 2018-06-06 11:14:15 +0200 |
|---|---|---|
| committer | Anatol Belski <ab@php.net> | 2018-06-06 11:14:15 +0200 |
| commit | 0bafb530d639d5fca5d6ed95b5266625b66f2cdf (patch) | |
| tree | 7d6cd8ce71977f7f39c74ca4b33b91332e9f3cdc /ext/mysqlnd/mysqlnd_connection.c | |
| parent | 917222f3954e19a04ac311b60bfa1ee121ae81f4 (diff) | |
| parent | f96df64cb2219fda42ca875483f874cf3052647c (diff) | |
| download | php-git-0bafb530d639d5fca5d6ed95b5266625b66f2cdf.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix VC compilation as variable size array is not supported
Fix MySQL 8 auth
Diffstat (limited to 'ext/mysqlnd/mysqlnd_connection.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index ea3d1cb0b7..f53eca5336 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -678,7 +678,10 @@ MYSQLND_METHOD(mysqlnd_conn_data, connect)(MYSQLND_CONN_DATA * conn, { const MYSQLND_CSTRING scheme = { transport.s, transport.l }; + /* This will be overwritten below with a copy, but we can use it during authentication */ + conn->unix_socket.s = (char *)socket_or_pipe.s; if (FAIL == conn->m->connect_handshake(conn, &scheme, &username, &password, &database, mysql_flags)) { + conn->unix_socket.s = NULL; goto err; } } |