diff options
| author | Ulf Wendel <uw@php.net> | 2010-08-30 16:59:10 +0000 |
|---|---|---|
| committer | Ulf Wendel <uw@php.net> | 2010-08-30 16:59:10 +0000 |
| commit | 42fea46887ce851098ef10c07624535b0c15bb49 (patch) | |
| tree | cbf7f9b6864c5733555c44796a4defb88deb5456 | |
| parent | 1cd82c9db23749b692b35fccd2ba17ee9d1f60c2 (diff) | |
| download | php-git-42fea46887ce851098ef10c07624535b0c15bb49.tar.gz | |
Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options().
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 3 | ||||
| -rw-r--r-- | ext/mysqli/tests/mysqli_constants.phpt | 4 |
3 files changed, 10 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index 8049bb5414..cb226ed56b 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -670,6 +670,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 1808c7ba54..644598225f 100644 --- 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 418eb070e5..851d5b9693 100644 --- 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; |