archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-19 08:49:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options().

Browse source
This commit is contained in:
Ulf Wendel 2010-08-30 16:59:10 +00:00
parent 71966d1e5a
commit f671ad6275
3 changed files with 10 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ext/mysqli/mysqli.c
View file

@ -668,6 +668,9 @@ PHP_MINIT_FUNCTION(mysqli)
#ifdef MYSQLND_STRING_TO_INT_CONVERSION #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); REGISTER_LONG_CONSTANT("MYSQLI_OPT_INT_AND_FLOAT_NATIVE", MYSQLND_OPT_INT_AND_FLOAT_NATIVE, CONST_CS | CONST_PERSISTENT);
#endif #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 */ /* mysqli_real_connect flags */
REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL", CLIENT_SSL, CONST_CS | CONST_PERSISTENT);

3
ext/mysqli/mysqli_api.c
View file

@ -1652,6 +1652,9 @@ static int mysqli_options_get_option_zval_type(int option)
#ifdef MYSQL_OPT_COMPRESS #ifdef MYSQL_OPT_COMPRESS
case MYSQL_OPT_COMPRESS: case MYSQL_OPT_COMPRESS:
#endif /* mysqlnd @ PHP 5.3.2 */ #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; return IS_LONG;
#ifdef MYSQL_SHARED_MEMORY_BASE_NAME #ifdef MYSQL_SHARED_MEMORY_BASE_NAME

4
ext/mysqli/tests/mysqli_constants.phpt
View file

@ -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 */ /* pretty dump test, but that is the best way to mimic mysql.c */
if (defined('MYSQLI_DATA_TRUNCATED')) if (defined('MYSQLI_DATA_TRUNCATED'))
$expected_constants["MYSQLI_DATA_TRUNCATED"] = true; $expected_constants["MYSQLI_DATA_TRUNCATED"] = true;