diff options
| author | Andrey Hristov <andrey@php.net> | 2015-11-10 12:56:07 +0100 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-11-12 16:19:16 +0100 |
| commit | 2cea04165ca4b40d091554a01c4a6f922896ef9b (patch) | |
| tree | d8dd9c3ce05357d8cc9702c002b375d53f5bebff /ext/mysqlnd/mysqlnd.c | |
| parent | c286d7075dc46b0ce6442adb7b632bed99e16bdb (diff) | |
| download | php-git-2cea04165ca4b40d091554a01c4a6f922896ef9b.tar.gz | |
MNDR:
- move all data members from MYSQLND_PFC to MYSQLND_PFC_DATA
Diffstat (limited to 'ext/mysqlnd/mysqlnd.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/ext/mysqlnd/mysqlnd.c b/ext/mysqlnd/mysqlnd.c index b0498ef404..9e627782bc 100644 --- a/ext/mysqlnd/mysqlnd.c +++ b/ext/mysqlnd/mysqlnd.c @@ -543,7 +543,7 @@ mysqlnd_run_authentication( scrambled_data = auth_plugin->methods.get_auth_data(NULL, &scrambled_data_len, conn, user, passwd, passwd_len, plugin_data, plugin_data_len, session_options, - &conn->protocol_frame_codec->data->options, mysql_flags); + conn->protocol_frame_codec->data, mysql_flags); if (conn->error_info->error_no) { goto end; } @@ -685,7 +685,7 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * mysql_flags &= ~CLIENT_COMPRESS; } #else - if (pfc && pfc->data->options.flags & MYSQLND_NET_FLAG_USE_COMPRESSION) { + if (pfc && pfc->data->flags & MYSQLND_NET_FLAG_USE_COMPRESSION) { mysql_flags |= CLIENT_COMPRESS; } #endif @@ -694,8 +694,11 @@ MYSQLND_METHOD(mysqlnd_conn_data, get_updated_connect_flags)(MYSQLND_CONN_DATA * mysql_flags &= ~CLIENT_SSL; } #else - if (vio && (vio->data->options.ssl_key || vio->data->options.ssl_cert || - vio->data->options.ssl_ca || vio->data->options.ssl_capath || vio->data->options.ssl_cipher)) + if (vio && (vio->data->options.ssl_key || + vio->data->options.ssl_cert || + vio->data->options.ssl_ca || + vio->data->options.ssl_capath || + vio->data->options.ssl_cipher)) { mysql_flags |= CLIENT_SSL; } |