uw Mon, 30 Aug 2010 16:59:10 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=302897
Log: Adding MYSQLI_OPT_SSL_VERIFY_SERVER_CERT for use with mysqli_options(). Changed paths: U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c U php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c U php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt U php/php-src/trunk/ext/mysqli/mysqli.c U php/php-src/trunk/ext/mysqli/mysqli_api.c U php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli.c 2010-08-30 16:59:10 UTC (rev 302897) @@ -668,6 +668,9 @@ #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); Modified: php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/branches/PHP_5_3/ext/mysqli/mysqli_api.c 2010-08-30 16:59:10 UTC (rev 302897) @@ -1652,6 +1652,9 @@ #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 Modified: php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt =================================================================== --- php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/branches/PHP_5_3/ext/mysqli/tests/mysqli_constants.phpt 2010-08-30 16:59:10 UTC (rev 302897) @@ -150,6 +150,10 @@ )); } + 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; Modified: php/php-src/trunk/ext/mysqli/mysqli.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli.c 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/trunk/ext/mysqli/mysqli.c 2010-08-30 16:59:10 UTC (rev 302897) @@ -670,6 +670,9 @@ #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); Modified: php/php-src/trunk/ext/mysqli/mysqli_api.c =================================================================== --- php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/trunk/ext/mysqli/mysqli_api.c 2010-08-30 16:59:10 UTC (rev 302897) @@ -1652,6 +1652,9 @@ #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 Modified: php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt =================================================================== --- php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt 2010-08-30 16:57:06 UTC (rev 302896) +++ php/php-src/trunk/ext/mysqli/tests/mysqli_constants.phpt 2010-08-30 16:59:10 UTC (rev 302897) @@ -150,6 +150,10 @@ )); } + 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;
-- PHP CVS Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php