diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-25 12:35:54 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-25 12:35:54 +0200 |
| commit | 86e7aa20ad57e52db5d4d0f56afd435f95156b22 (patch) | |
| tree | 893c2dda03a9d8213a6578d47c502c28cafd9210 /ext/mysqli/mysqli_api.c | |
| parent | 5dd1877ca173bed3f3974ab37e994495cce68b14 (diff) | |
| parent | 063082043adf6fd5363078a3c04f7977ac22d73d (diff) | |
| download | php-git-86e7aa20ad57e52db5d4d0f56afd435f95156b22.tar.gz | |
Merge branch 'PHP-7.3' into PHP-7.4
* PHP-7.3:
Remove bogus REGISTER_LONG_CONSTANT
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index 6462c19c4d..438c6cce55 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1714,16 +1714,13 @@ 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 */ #if (MYSQL_VERSION_ID >= 50611 && defined(CLIENT_CAN_HANDLE_EXPIRED_PASSWORDS)) || defined(MYSQLI_USE_MYSQLND) case MYSQL_OPT_CAN_HANDLE_EXPIRED_PASSWORDS: #endif return IS_LONG; #ifdef MYSQL_SHARED_MEMORY_BASE_NAME - case MYSQL_SHARED_MEMORY_BASE_NAME: + case MYSQL_SHARED_MEMORY_BASE_NAME: #endif /* MySQL 4.1.0 */ #ifdef MYSQL_SET_CLIENT_IP case MYSQL_SET_CLIENT_IP: |