summaryrefslogtreecommitdiff
path: root/ext/mysqlnd/mysqlnd_net.c
diff options
context:
space:
mode:
authorAndrey Hristov <andrey@php.net>2015-10-21 16:15:45 +0200
committerAndrey Hristov <andrey@php.net>2015-10-21 16:15:45 +0200
commit53895bdf49498dd3443f05c9ff465fe84199cd57 (patch)
tree2d075cc2124c6596f19a386c67f396b491f35438 /ext/mysqlnd/mysqlnd_net.c
parent387b7c7905490cc66c0f4e1e19727a03ac768801 (diff)
parent8f9b2b68ee017535af5634800158edc76c6cdeb3 (diff)
downloadphp-git-53895bdf49498dd3443f05c9ff465fe84199cd57.tar.gz
Merge branch 'PHP-7.0'
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
-rw-r--r--ext/mysqlnd/mysqlnd_net.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c
index d8ad4f713e..5abca3863b 100644
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@ -909,6 +909,12 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net)
zval verify_peer_zval;
ZVAL_TRUE(&verify_peer_zval);
php_stream_context_set_option(context, "ssl", "verify_peer", &verify_peer_zval);
+ php_stream_context_set_option(context, "ssl", "verify_peer_name", &verify_peer_zval);
+ } else {
+ zval verify_peer_zval;
+ ZVAL_FALSE(&verify_peer_zval);
+ php_stream_context_set_option(context, "ssl", "verify_peer", &verify_peer_zval);
+ php_stream_context_set_option(context, "ssl", "verify_peer_name", &verify_peer_zval);
}
if (net->data->options.ssl_cert) {
zval cert_zval;
@@ -926,7 +932,7 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net)
if (net->data->options.ssl_capath) {
zval capath_zval;
ZVAL_STRING(&capath_zval, net->data->options.ssl_capath);
- php_stream_context_set_option(context, "ssl", "cafile", &capath_zval);
+ php_stream_context_set_option(context, "ssl", "capath", &capath_zval);
}
if (net->data->options.ssl_passphrase) {
zval passphrase_zval;