Merge branch 'PHP-5.6' into PHP-7.0

diff --cc ext/mysqli/mysqli.c
Simple merge

diff --cc ext/mysqlnd/mysqlnd_net.c
index 5abca3863ba30d3df0513eef209058a015b08012,7b164ac29424b06f46807cb5655f0cb8ea5a596c..710d6fa62c86d0d960e966821af5d6190c45fad8
--- 1/ext/mysqlnd/mysqlnd_net.c
--- 2/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);
        }