Fix a memleak with mysqlnd and SSL

Author: johannes

NEWS

@@ -19,6 +19,10 @@ PHP NEWS
 - libxml2:
  . Fixed bug #75871 (use pkg-config where available). (pmmaga)
 
+- mysqlnd
+ . Fixed negotiation of MySQL authenticaton plugin. (Johannes)
+ . Fixed a memleak with SSL connections. (Johannes)
+
 - ODBC:
  . Fixed bug #73725 (Unable to retrieve value of varchar(max) type). (Anatol)
 

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;

ext/mysqlnd/mysqlnd_vio.c

@@ -517,6 +517,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) {