diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-21 15:52:38 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-10-21 15:52:38 +0200 |
| commit | 8f9b2b68ee017535af5634800158edc76c6cdeb3 (patch) | |
| tree | ddc6f72be2d033f2a3830e9dfd7528545d75507d /ext/mysqlnd/mysqlnd_net.c | |
| parent | 2ef327caed5e7cb2683c040904a57d0cc6be1e5d (diff) | |
| parent | 8292260515a904b4d515484145c78f33a06ae1ae (diff) | |
| download | php-git-8f9b2b68ee017535af5634800158edc76c6cdeb3.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/mysqlnd/mysqlnd_net.c')
| -rw-r--r-- | ext/mysqlnd/mysqlnd_net.c | 8 |
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; |