diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:45:45 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2018-09-04 05:47:28 +0200 |
| commit | 03740ef7dffcc80530a89ebde3ccf5464f7f18e6 (patch) | |
| tree | 442543832b4f241a5cea6b6d596cca9a2f79c023 /ext/mysqlnd/mysqlnd_connection.c | |
| parent | f1f39d7ed7fb6f6aaa2edea165aae4bc58a09de7 (diff) | |
| download | php-git-03740ef7dffcc80530a89ebde3ccf5464f7f18e6.tar.gz | |
Revert all MySQL auth related changes
Per bug #76651 these changes do not appear to work correctly in
some cases. As no immediate fix seems to be forthcoming, I'm
reverting these changes.
Revert "Fixed invalid free introduced by d6e81f0bfd0cb90586dd83d4fd47a4302605261a (avoid keeping "invalid" pointer)"
This reverts commit 11507c0e1bfa17a96480f3648397f6975c31551e.
Revert "Fix mysqlnd build without openssl"
This reverts commit 6c9db02ff7812c298d1e7e292ba731d9d3a66790.
Revert "Fix VC compilation as variable size array is not supported"
This reverts commit f96df64cb2219fda42ca875483f874cf3052647c.
Revert "Fix MySQL 8 auth"
This reverts commit d6e81f0bfd0cb90586dd83d4fd47a4302605261a.
Diffstat (limited to 'ext/mysqlnd/mysqlnd_connection.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_connection.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd_connection.c b/ext/mysqlnd/mysqlnd_connection.c index 2f458149a6..654673f500 100644 --- a/ext/mysqlnd/mysqlnd_connection.c +++ b/ext/mysqlnd/mysqlnd_connection.c @@ -678,13 +678,9 @@ 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; } - conn->unix_socket.s = NULL; } { |