clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 02:17:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removed pdo_odbc.db2_instance_name

Browse Source
This commit is contained in:
Kalle Sommer Nielsen 2019-03-01 01:24:53 +02:00
parent e7f766742b
commit fddc751024
3 changed files with 0 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
ext/pdo_odbc/pdo_odbc.c
View File

@ -66,13 +66,6 @@ zend_ulong pdo_odbc_pool_on = SQL_CP_OFF;
zend_ulong pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV; zend_ulong pdo_odbc_pool_mode = SQL_CP_ONE_PER_HENV;
#endif #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 */
PHP_MINIT_FUNCTION(pdo_odbc) PHP_MINIT_FUNCTION(pdo_odbc)
{ {
@ -84,26 +77,6 @@ PHP_MINIT_FUNCTION(pdo_odbc)
return FAILURE; 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 #ifdef SQL_ATTR_CONNECTION_POOLING
/* ugh, we don't really like .ini stuff in PDO, but since ODBC connection /* 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 * 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) PHP_MSHUTDOWN_FUNCTION(pdo_odbc)
{ {
#if defined(DB2CLI_VER) && !defined(PHP_WIN32)
UNREGISTER_INI_ENTRIES();
#endif
php_pdo_unregister_driver(&pdo_odbc_driver); php_pdo_unregister_driver(&pdo_odbc_driver);
return SUCCESS; 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"); php_info_print_table_row(2, "ODBC Connection Pooling", "Not supported in this build");
#endif #endif
php_info_print_table_end(); php_info_print_table_end();
#if defined(DB2CLI_VER) && !defined(PHP_WIN32)
DISPLAY_INI_ENTRIES();
#endif
} }
/* }}} */ /* }}} */

2
php.ini-development
View File

@ -1019,8 +1019,6 @@ cli_server.color = On
; http://php.net/pdo-odbc.connection-pooling ; http://php.net/pdo-odbc.connection-pooling
;pdo_odbc.connection_pooling=strict ;pdo_odbc.connection_pooling=strict
;pdo_odbc.db2_instance_name
[Pdo_mysql] [Pdo_mysql]
; Default socket name for local MySQL connects. If empty, uses the built-in ; Default socket name for local MySQL connects. If empty, uses the built-in
; MySQL defaults. ; MySQL defaults.

2
php.ini-production
View File

@ -1019,8 +1019,6 @@ cli_server.color = On
; http://php.net/pdo-odbc.connection-pooling ; http://php.net/pdo-odbc.connection-pooling
;pdo_odbc.connection_pooling=strict ;pdo_odbc.connection_pooling=strict
;pdo_odbc.db2_instance_name
[Pdo_mysql] [Pdo_mysql]
; Default socket name for local MySQL connects. If empty, uses the built-in ; Default socket name for local MySQL connects. If empty, uses the built-in
; MySQL defaults. ; MySQL defaults.