diff options
| author | Hannes Magnusson <bjori@php.net> | 2006-10-14 15:06:11 +0000 |
|---|---|---|
| committer | Hannes Magnusson <bjori@php.net> | 2006-10-14 15:06:11 +0000 |
| commit | 8104df054705802ae9a1bbcda4529aef18d671ee (patch) | |
| tree | d467e059b197b69ab3771c02218b1f027e2a7246 | |
| parent | 3bd0f950da1673fc9e02b337ceaa58217685ba7f (diff) | |
| download | php-git-8104df054705802ae9a1bbcda4529aef18d671ee.tar.gz | |
Remove bogus ini entry
| -rwxr-xr-x | ext/pdo/pdo.c | 12 | ||||
| -rw-r--r-- | php.ini-dist | 3 | ||||
| -rw-r--r-- | php.ini-recommended | 3 |
3 files changed, 0 insertions, 18 deletions
diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c index 1e78952d0c..2106e7d407 100755 --- a/ext/pdo/pdo.c +++ b/ext/pdo/pdo.c @@ -162,12 +162,6 @@ zend_module_entry pdo_module_entry = { ZEND_GET_MODULE(pdo) #endif -/* {{{ PHP_INI */ -PHP_INI_BEGIN() - STD_PHP_INI_ENTRY("pdo.global_value", "42", PHP_INI_ALL, OnUpdateLong, global_value, zend_pdo_globals, pdo_globals) -PHP_INI_END() -/* }}} */ - /* {{{ PHP_GINIT_FUNCTION */ static PHP_GINIT_FUNCTION(pdo) { @@ -326,8 +320,6 @@ PHP_MINIT_FUNCTION(pdo) spl_ce_RuntimeException = NULL; - REGISTER_INI_ENTRIES(); - if (FAILURE == pdo_sqlstate_init_error_table()) { return FAILURE; } @@ -353,7 +345,6 @@ PHP_MINIT_FUNCTION(pdo) /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo) { - UNREGISTER_INI_ENTRIES(); zend_hash_destroy(&pdo_driver_hash); pdo_sqlstate_fini_error_table(); return SUCCESS; @@ -388,9 +379,6 @@ PHP_MINFO_FUNCTION(pdo) php_info_print_table_end(); -#if 0 - DISPLAY_INI_ENTRIES(); -#endif } /* }}} */ diff --git a/php.ini-dist b/php.ini-dist index 3e00ea39de..4fee3fee80 100644 --- a/php.ini-dist +++ b/php.ini-dist @@ -641,9 +641,6 @@ default_socket_timeout = 60 ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0 diff --git a/php.ini-recommended b/php.ini-recommended index 9de3a1cd5b..b2a640af9c 100644 --- a/php.ini-recommended +++ b/php.ini-recommended @@ -686,9 +686,6 @@ default_socket_timeout = 60 ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0 |