diff options
| author | Nikita Popov <nikic@php.net> | 2016-01-30 14:56:17 +0100 |
|---|---|---|
| committer | Nikita Popov <nikic@php.net> | 2016-01-30 15:35:28 +0100 |
| commit | 93dc91b386b53bdd317ea6abd70640e2bbfbaf73 (patch) | |
| tree | d41b6d2baf80da77c154a4174634d6728e86bb31 /ext/mysqli/mysqli_api.c | |
| parent | 2eb4728611ac9ff6aa77fece737470beabe1db62 (diff) | |
| download | php-git-93dc91b386b53bdd317ea6abd70640e2bbfbaf73.tar.gz | |
Remove version checks
PHP_VERSION_ID
PHP_API_VERSION
ZEND_MODULE_API_NO
PHP_MAJOR_VERSION, PHP_MINOR_VERSION
ZEND_ENGINE_2
I've left litespeed alone, as it seems to genuinely maintain support
for many PHP versions.
Diffstat (limited to 'ext/mysqli/mysqli_api.c')
| -rw-r--r-- | ext/mysqli/mysqli_api.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/ext/mysqli/mysqli_api.c b/ext/mysqli/mysqli_api.c index e32b377735..333e890f3b 100644 --- a/ext/mysqli/mysqli_api.c +++ b/ext/mysqli/mysqli_api.c @@ -1697,10 +1697,6 @@ static int mysqli_options_get_option_zval_type(int option) { switch (option) { #ifdef MYSQLI_USE_MYSQLND -#if PHP_MAJOR_VERSION == 6 - /* PHP-7 doesn't supprt unicode */ - case MYSQLND_OPT_NUMERIC_AND_DATETIME_AS_UNICODE: -#endif case MYSQLND_OPT_NET_CMD_BUFFER_SIZE: case MYSQLND_OPT_NET_READ_BUFFER_SIZE: #ifdef MYSQLND_STRING_TO_INT_CONVERSION @@ -1781,11 +1777,7 @@ PHP_FUNCTION(mysqli_options) MYSQLI_FETCH_RESOURCE_CONN(mysql, mysql_link, MYSQLI_STATUS_INITIALIZED); #if !defined(MYSQLI_USE_MYSQLND) -#if PHP_API_VERSION < 20100412 - if ((PG(open_basedir) && PG(open_basedir)[0] != '\0') || PG(safe_mode)) { -#else if (PG(open_basedir) && PG(open_basedir)[0] != '\0') { -#endif if(mysql_option == MYSQL_OPT_LOCAL_INFILE) { RETURN_FALSE; } |