archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 13:38:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

ext/odbc: Remove unused INI settings (#14399)

Browse source
This commit is contained in:
Gina Peter Banyard 2024-06-01 17:06:34 +01:00 • committed by GitHub
parent f69c55b5b6
commit c3b3e90cea
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 0 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

35
ext/odbc/php_odbc.c
View file

@ -370,35 +370,6 @@ static PHP_INI_DISP(display_link_nums)
} }
/* }}} */ /* }}} */
/* {{{ PHP_INI_DISP(display_defPW) */
static PHP_INI_DISP(display_defPW)
{
char *value;
if (type == PHP_INI_DISPLAY_ORIG && ini_entry->modified) {
value = ZSTR_VAL(ini_entry->orig_value);
} else if (ini_entry->value) {
value = ZSTR_VAL(ini_entry->value);
} else {
value = NULL;
}
if (value) {
#if PHP_DEBUG
php_printf("%s", value);
#else
PUTS("********");
#endif
} else {
if (PG(html_errors)) {
PUTS("<i>no value</i>");
} else {
PUTS("no value");
}
}
}
/* }}} */
/* {{{ PHP_INI_DISP(display_binmode) */ /* {{{ PHP_INI_DISP(display_binmode) */
static PHP_INI_DISP(display_binmode) static PHP_INI_DISP(display_binmode)
{ {
@ -501,12 +472,6 @@ PHP_INI_BEGIN()
max_persistent, zend_odbc_globals, odbc_globals, display_link_nums) max_persistent, zend_odbc_globals, odbc_globals, display_link_nums)
STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong, STD_PHP_INI_ENTRY_EX("odbc.max_links", "-1", PHP_INI_SYSTEM, OnUpdateLong,
max_links, zend_odbc_globals, odbc_globals, display_link_nums) max_links, zend_odbc_globals, odbc_globals, display_link_nums)
STD_PHP_INI_ENTRY("odbc.default_db", NULL, PHP_INI_ALL, OnUpdateString,
defDB, zend_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY("odbc.default_user", NULL, PHP_INI_ALL, OnUpdateString,
defUser, zend_odbc_globals, odbc_globals)
STD_PHP_INI_ENTRY_EX("odbc.default_pw", NULL, PHP_INI_ALL, OnUpdateString,
defPW, zend_odbc_globals, odbc_globals, display_defPW)
STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong, STD_PHP_INI_ENTRY_EX("odbc.defaultlrl", "4096", PHP_INI_ALL, OnUpdateLong,
defaultlrl, zend_odbc_globals, odbc_globals, display_lrl) defaultlrl, zend_odbc_globals, odbc_globals, display_lrl)
STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong, STD_PHP_INI_ENTRY_EX("odbc.defaultbinmode", "1", PHP_INI_ALL, OnUpdateLong,

3
ext/odbc/php_odbc_includes.h
View file

@ -233,9 +233,6 @@ typedef struct odbc_result {
} odbc_result; } odbc_result;
ZEND_BEGIN_MODULE_GLOBALS(odbc) ZEND_BEGIN_MODULE_GLOBALS(odbc)
char *defDB;
char *defUser;
char *defPW;
bool allow_persistent; bool allow_persistent;
bool check_persistent; bool check_persistent;
zend_long max_persistent; zend_long max_persistent;