cvs: php-src / php.ini-dist php.ini-recommended /ext/pdo pdo.c

bjori Sat Oct 14 15:07:36 2006 UTC Modified files: /php-src/ext/pdo pdo.c /php-src php.ini-recommended php.ini-dist Log: MFB: Remove bogus INI entry http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.75&r2=1.76&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.75 php-src/ext/pdo/pdo.c:1.76 --- php-src/ext/pdo/pdo.c:1.75 Tue Jun 13 13:12:19 2006 +++ php-src/ext/pdo/pdo.c Sat Oct 14 15:07:36 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.75 2006/06/13 13:12:19 dmitry Exp $ */ +/* $Id: pdo.c,v 1.76 2006/10/14 15:07:36 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -157,12 +157,6 @@ 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) { @@ -321,8 +315,6 @@ spl_ce_RuntimeException = NULL; - REGISTER_INI_ENTRIES(); - if (FAILURE == pdo_sqlstate_init_error_table()) { return FAILURE; } @@ -348,7 +340,6 @@ /* {{{ PHP_MSHUTDOWN_FUNCTION */ PHP_MSHUTDOWN_FUNCTION(pdo) { - UNREGISTER_INI_ENTRIES(); zend_hash_destroy(&pdo_driver_hash); pdo_sqlstate_fini_error_table(); return SUCCESS; @@ -381,9 +372,6 @@ php_info_print_table_end(); -#if 0 - DISPLAY_INI_ENTRIES(); -#endif } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.205&r2=1.206&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.205 php-src/php.ini-recommended:1.206 --- php-src/php.ini-recommended:1.205 Thu Sep 28 19:39:25 2006 +++ php-src/php.ini-recommended Sat Oct 14 15:07:36 2006 @@ -598,9 +598,6 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0 http://cvs.php.net/viewvc.cgi/php-src/php.ini-dist?r1=1.256&r2=1.257&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.256 php-src/php.ini-dist:1.257 --- php-src/php.ini-dist:1.256 Thu Sep 28 19:39:25 2006 +++ php-src/php.ini-dist Sat Oct 14 15:07:36 2006 @@ -567,9 +567,6 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0