com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_net.c
| From: | Andrey Hristov | Date: | Thu, 22 Oct 2015 09:50:12 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mysqli/mysqli.c ext/mysqlnd/mysqlnd_net.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89482@lists.php.net to get a copy of this message | ||
Commit: 3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4
Author: Andrey Hristov <andrey@php.net> Thu, 22 Oct 2015 11:50:12 +0200
Parents: 8f9b2b68ee017535af5634800158edc76c6cdeb3 afd31489d0d9999f701467e99ef2b40794eed196
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/mysqli/mysqli.c
MM ext/mysqlnd/mysqlnd_net.c
Diff:
diff --cc ext/mysqlnd/mysqlnd_net.c
index 5abca38,7b164ac..710d6fa
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@@ -902,17 -894,12 +902,12 @@@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)
if (net->data->options.ssl_key) {
zval key_zval;
- ZVAL_STRING(&key_zval, net->data->options.ssl_key, 0);
+ 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);
}