diff options
| author | Johannes Schlüter <johannes@php.net> | 2018-02-20 23:33:01 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2018-02-20 23:33:01 +0100 |
| commit | 64ba5d4a0610908a26df06fb5a686f6d1b6fb281 (patch) | |
| tree | 1a9261737e32b553e64aaeafef802fe15a523433 /ext/mysqlnd | |
| parent | b35a64bf6270db660c51c85b55af5f38f24fb1fb (diff) | |
| parent | 2577cdbea2d8c6accd0cb311ee4490ee24d637fd (diff) | |
| download | php-git-64ba5d4a0610908a26df06fb5a686f6d1b6fb281.tar.gz | |
Merge branch 'PHP-7.2'
Diffstat (limited to 'ext/mysqlnd')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_auth.c | 2 | ||||
| -rw-r--r-- | ext/mysqlnd/mysqlnd_vio.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_auth.c b/ext/mysqlnd/mysqlnd_auth.c index 800c8a28bc..c5d610c1eb 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -761,7 +761,7 @@ mysqlnd_sha256_auth_get_auth_data(struct st_mysqlnd_authentication_plugin * self DBG_INF_FMT("salt(%d)=[%.*s]", auth_plugin_data_len, auth_plugin_data_len, auth_plugin_data); - if (conn->protocol_frame_codec->data->ssl) { + if (conn->vio->data->ssl) { DBG_INF("simple clear text under SSL"); /* clear text under SSL */ *auth_data_len = passwd_len; diff --git a/ext/mysqlnd/mysqlnd_vio.c b/ext/mysqlnd/mysqlnd_vio.c index d5fce1d5fe..a6a7f5c4d1 100644 --- a/ext/mysqlnd/mysqlnd_vio.c +++ b/ext/mysqlnd/mysqlnd_vio.c @@ -514,6 +514,7 @@ MYSQLND_METHOD(mysqlnd_vio, enable_ssl)(MYSQLND_VIO * const net) zval cafile_zval; ZVAL_STRING(&cafile_zval, net->data->options.ssl_ca); php_stream_context_set_option(context, "ssl", "cafile", &cafile_zval); + zval_ptr_dtor(&cafile_zval); any_flag = TRUE; } if (net->data->options.ssl_capath) { |