diff options
| author | Johannes Schlüter <johannes@php.net> | 2018-02-20 23:32:25 +0100 |
|---|---|---|
| committer | Johannes Schlüter <johannes@php.net> | 2018-02-20 23:32:25 +0100 |
| commit | 2577cdbea2d8c6accd0cb311ee4490ee24d637fd (patch) | |
| tree | 736189ed11c9ccbf31c59eea9434722b8ebd7261 | |
| parent | 1c98955d0fd40c1e7584f2c644454cc7b7c778e5 (diff) | |
| parent | 42952a756e20f147db9ef6cd1f16db6cfaabfef1 (diff) | |
| download | php-git-2577cdbea2d8c6accd0cb311ee4490ee24d637fd.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
| -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 98366d0e87..3ba447cfdf 100644 --- a/ext/mysqlnd/mysqlnd_auth.c +++ b/ext/mysqlnd/mysqlnd_auth.c @@ -787,7 +787,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 aaa5fb4ea4..4ca4797966 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) { |