diff options
| author | Andrey Hristov <andrey@php.net> | 2015-10-22 11:50:12 +0200 |
|---|---|---|
| committer | Andrey Hristov <andrey@php.net> | 2015-10-22 11:50:12 +0200 |
| commit | 3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4 (patch) | |
| tree | d2c2986a76232de37a7102fc11724e79492b0a87 /ext/mysqli/mysqli.c | |
| parent | 8f9b2b68ee017535af5634800158edc76c6cdeb3 (diff) | |
| parent | afd31489d0d9999f701467e99ef2b40794eed196 (diff) | |
| download | php-git-3dc0bf7428f32908d4c1fe0236e5d0ef23a8eed4.tar.gz | |
Merge branch 'PHP-5.6' into PHP-7.0
Diffstat (limited to 'ext/mysqli/mysqli.c')
| -rw-r--r-- | ext/mysqli/mysqli.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/ext/mysqli/mysqli.c b/ext/mysqli/mysqli.c index ff1638d7d5..0ba65696f4 100644 --- a/ext/mysqli/mysqli.c +++ b/ext/mysqli/mysqli.c @@ -718,6 +718,9 @@ PHP_MINIT_FUNCTION(mysqli) REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_IGNORE_SPACE", CLIENT_IGNORE_SPACE, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_NO_SCHEMA", CLIENT_NO_SCHEMA, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_FOUND_ROWS", CLIENT_FOUND_ROWS, CONST_CS | CONST_PERSISTENT); +#ifdef CLIENT_SSL_VERIFY_SERVER_CERT + REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_SSL_VERIFY_SERVER_CERT", CLIENT_SSL_VERIFY_SERVER_CERT, CONST_CS | CONST_PERSISTENT); +#endif #if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND) REGISTER_LONG_CONSTANT("MYSQLI_CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS", CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); REGISTER_LONG_CONSTANT("MYSQLI_OPT_CAN_HANDLE_EXPIRED_PASSWORDS", MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS, CONST_CS | CONST_PERSISTENT); |