Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options().

diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c
index 474541fecb298220aa217ec9c1870172a0bd615b..6cdee91a7a6e578c8e05b9bb1de65ecb4f79c4a2 100644 (file)
--- a/ext/mysqli/mysqli.c
+++ b/ext/mysqli/mysqli.c
@@ -668,6 +668,9 @@ PHP_MINIT_FUNCTION(mysqli)
 #ifdef MYSQLND_STRING_TO_INT_CONVERSION
        REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
 #endif
+#if MYSQL_VERSION_ID > 50110 || defined(MYSQLI_USE_MYSQLND)
+       REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);     
+#endif
 
        /* mysqli_real_connect flags */ 
        REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);

diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c
index 1808c7ba54d48340fd265081a0926dc287e863a9..644598225fe28a572dfff044c0a7ef958f922be3 100644 (file)
--- a/ext/mysqli/mysqli_api.c
+++ b/ext/mysqli/mysqli_api.c
@@ -1652,6 +1652,9 @@ static int mysqli_options_get_option_zval_type(int option)
 #ifdef MYSQL_OPT_COMPRESS
                case MYSQL_OPT_COMPRESS:
 #endif /* mysqlnd @ PHP 5.3.2 */
+#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
+       REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);     
+#endif /* MySQL 5.1.1., mysqlnd @ PHP 5.3.3 */
                        return IS_LONG;
 
 #ifdef MYSQL_SHARED_MEMORY_BASE_NAME

diff --git a/ext/mysqli/tests/mysqli_constants.phpt b/ext/mysqli/tests/mysqli_constants.phpt
index 418eb070e5f80b0e842776d0928942371b67d290..851d5b969371e0f693554b087ede6b9b374074a0 100644 (file)
--- a/ext/mysqli/tests/mysqli_constants.phpt
+++ b/ext/mysqli/tests/mysqli_constants.phpt
@@ -150,6 +150,10 @@ require_once('skipifconnectfailure.inc');
                ));
        }
 
+       if ($version > 50110 || $IS_MYSQLND) {
+               $expected_constants['MYSQLI_OPT_SSL_VERIFY_SERVER_CERT'] = true;
+       }
+
        /* pretty dump test, but that is the best way to mimic mysql.c */
        if (defined('MYSQLI_DATA_TRUNCATED'))
                $expected_constants["MYSQLI_DATA_TRUNCATED"] = true;