com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mysqlnd/m ysqlnd_net.c
| From: | Andrey Hristov | Date: | Wed, 21 Oct 2015 13:52:38 +0000 |
| Subject: | com php-src: Merge branch 'PHP-5.6' into PHP-7.0: ext/mysqlnd/m ysqlnd_net.c | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-89477@lists.php.net to get a copy of this message | ||
Commit: 8f9b2b68ee017535af5634800158edc76c6cdeb3
Author: Andrey Hristov <andrey@php.net> Wed, 21 Oct 2015 15:52:38 +0200
Parents: 2ef327caed5e7cb2683c040904a57d0cc6be1e5d 8292260515a904b4d515484145c78f33a06ae1ae
Branches: master
Link: http://git.php.net/?p=php-src..git;a=commitdiff;h=8f9b2b68ee017535af5634800158edc76c6cdeb3
Log:
Merge branch 'PHP-5.6' into PHP-7.0
Changed paths:
MM ext/mysqlnd/mysqlnd_net.c
Diff:
diff --cc ext/mysqlnd/mysqlnd_net.c
index d8ad4f7,4cbe9de..5abca38
--- a/ext/mysqlnd/mysqlnd_net.c
+++ b/ext/mysqlnd/mysqlnd_net.c
@@@ -925,8 -923,8 +931,8 @@@ MYSQLND_METHOD(mysqlnd_net, enable_ssl)
}
if (net->data->options.ssl_capath) {
zval capath_zval;
- ZVAL_STRING(&capath_zval, net->data->options.ssl_capath, 0);
+ 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;