Skip to content

Commit d430b5a

Browse files
committed
Add mysqli support - constants and checking in mysqli_options() for the
new constant for password expriration
1 parent 258c76e commit d430b5a

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

ext/mysqli/mysqli.c

+3
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,9 @@ PHP_MINIT_FUNCTION(mysqli)
838838
REGISTER_LONG_CONSTANT("MYSQLI_REFRESH_BACKUP_LOG", REFRESH_BACKUP_LOG, CONST_CS | CONST_PERSISTENT);
839839
#endif
840840

841+
#if MYSQL_VERSION_ID >= 50611 || defined(MYSQLI_USE_MYSQLND)
842+
REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT);
843+
#endif
841844

842845
#ifdef MYSQLI_USE_MYSQLND
843846
mysqlnd_reverse_api_register_api(&mysqli_reverse_api TSRMLS_CC);

ext/mysqli/mysqli_api.c

+3
Original file line numberDiff line numberDiff line change
@@ -1672,6 +1672,9 @@ static int mysqli_options_get_option_zval_type(int option)
16721672
#ifdef MYSQL_OPT_SSL_VERIFY_SERVER_CERT
16731673
REGISTER_LONG_CONSTANT("MYSQLI_OPT_SSL_VERIFY_SERVER_CERT", MYSQL_OPT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT);
16741674
#endif /* MySQL 5.1.1., mysqlnd @ PHP 5.3.3 */
1675+
#if MYSQL_VERSION_ID >= 50611 || defined(MYSQLI_USE_MYSQLND)
1676+
case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS:
1677+
#endif
16751678
return IS_LONG;
16761679

16771680
#ifdef MYSQL_SHARED_MEMORY_BASE_NAME

0 commit comments

Comments
 (0)