diff options
| -rw-r--r-- | ext/pdo_odbc/pdo_odbc.c | 34 | ||||
| -rw-r--r-- | php.ini-development | 2 | ||||
| -rw-r--r-- | php.ini-production | 2 |
3 files changed, 0 insertions, 38 deletions
diff --git a/ext/pdo_odbc/pdo_odbc.c b/ext/pdo_odbc/pdo_odbc.c index 5f0eb26df3..762629fe01 100644 --- a/ext/pdo_odbc/pdo_odbc.c +++ b/ext/pdo_odbc/pdo_odbc.c @@ -66,13 +66,6 @@ zend_ulong pdo_odbc_pool_on = SQL_CP_OFF; zend_ulong pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV; #endif -#if defined(DB2CLI_VER) && !defined(PHP_WIN32) -PHP_INI_BEGIN() - PHP_INI_ENTRY("pdo_odbc.db2_instance_name", NULL, PHP_INI_SYSTEM, NULL) -PHP_INI_END() - -#endif - /* {{{ PHP_MINIT_FUNCTION */ PHP_MINIT_FUNCTION(pdo_odbc) { @@ -84,26 +77,6 @@ PHP_MINIT_FUNCTION(pdo_odbc) return FAILURE; } -#if defined(DB2CLI_VER) && !defined(PHP_WIN32) - REGISTER_INI_ENTRIES(); - { - char *instance = INI_STR("pdo_odbc.db2_instance_name"); - if (instance) { - char *env = malloc(sizeof("DB2INSTANCE=") + strlen(instance)); - - php_error_docref(NULL, E_DEPRECATED, "The pdo_odbc.db2_instance_name ini directive is deprecated and will be removed in the future"); - - if (!env) { - return FAILURE; - } - strcpy(env, "DB2INSTANCE="); - strcat(env, instance); - putenv(env); - /* after this point, we can't free env without breaking the environment */ - } - } -#endif - #ifdef SQL_ATTR_CONNECTION_POOLING /* ugh, we don't really like .ini stuff in PDO, but since ODBC connection * pooling is process wide, we can't set it from within the scope of a @@ -145,9 +118,6 @@ PHP_MINIT_FUNCTION(pdo_odbc) */ PHP_MSHUTDOWN_FUNCTION(pdo_odbc) { -#if defined(DB2CLI_VER) && !defined(PHP_WIN32) - UNREGISTER_INI_ENTRIES(); -#endif php_pdo_unregister_driver(&pdo_odbc_driver); return SUCCESS; } @@ -166,9 +136,5 @@ PHP_MINFO_FUNCTION(pdo_odbc) php_info_print_table_row(2, "ODBC Connection Pooling", "Not supported in this build"); #endif php_info_print_table_end(); - -#if defined(DB2CLI_VER) && !defined(PHP_WIN32) - DISPLAY_INI_ENTRIES(); -#endif } /* }}} */ diff --git a/php.ini-development b/php.ini-development index ff7af00255..979d8627b2 100644 --- a/php.ini-development +++ b/php.ini-development @@ -1019,8 +1019,6 @@ cli_server.color = On ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict -;pdo_odbc.db2_instance_name - [Pdo_mysql] ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. diff --git a/php.ini-production b/php.ini-production index c7914d07e5..be9f3a4eed 100644 --- a/php.ini-production +++ b/php.ini-production @@ -1019,8 +1019,6 @@ cli_server.color = On ; http://php.net/pdo-odbc.connection-pooling ;pdo_odbc.connection_pooling=strict -;pdo_odbc.db2_instance_name - [Pdo_mysql] ; Default socket name for local MySQL connects. If empty, uses the built-in ; MySQL defaults. |