archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 05:58:45 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Don't lose this data anymore. It worked without the fix,

Browse source 
but it with it is just correct (trunk only).
This commit is contained in:
Andrey Hristov 2011-01-31 13:29:18 +00:00
parent ddcac10dd1
commit d82b05a64b
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ext/mysqlnd/mysqlnd.c
View file

@ -588,10 +588,10 @@ mysqlnd_connect_run_authentication(
free(scrambled_data);
DBG_INF_FMT("switch_to_auth_protocol=%s", switch_to_auth_protocol? switch_to_auth_protocol:"n/a");
if (requested_protocol) {
if (requested_protocol && switch_to_auth_protocol) {
mnd_efree(requested_protocol);
requested_protocol = switch_to_auth_protocol;
}
requested_protocol = switch_to_auth_protocol;
if (plugin_data) {
mnd_efree(plugin_data);
@ -606,6 +606,7 @@ mysqlnd_connect_run_authentication(
}
if (ret == PASS) {
DBG_INF_FMT("saving requested_protocol=%s", requested_protocol);
conn->m->set_client_option(conn, MYSQLND_OPT_AUTH_PROTOCOL, requested_protocol TSRMLS_CC);
}