diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-22 11:50:12 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-10-22 11:50:12 +0200 |
| commit | 3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4 (patch) | |
| tree | d2c2986a76232de37a7102fc11724e79492b0a87 /ext/mysqlnd/mysqlnd_net.c | |
| parent | 8f9b2b68ee017535af5634800158edc76c6cdeb3 (diff) | |
| parent | afd31489d0d9999f701467e99ef2b40794eed196 (diff) | |
| download | php-git-3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4.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 | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ext/mysqlnd/mysqlnd_net.c b/ext/mysqlnd/mysqlnd_net.c index 5abca3863b..710d6fa62c 100644 --- a/ext/mysqlnd/mysqlnd_net.c +++ b/ext/mysqlnd/mysqlnd_net.c @@ -905,14 +905,9 @@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)(MYSQLND_NET * const net) ZVAL_STRING(&key_zval, net->data->options.ssl_key); php_stream_context_set_option(context, "ssl", "local_pk", &key_zval); } - if (net->data->options.ssl_verify_peer) { - 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); + ZVAL_BOOL(&verify_peer_zval, net->data->options.ssl_verify_peer); 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); } |