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

bjori Sat Oct 14 15:06:11 2006 UTC Modified files: (Branch: PHP_5_2) /php-src/ext/pdo pdo.c /php-src php.ini-recommended php.ini-dist Log: Remove bogus ini entry http://cvs.php.net/viewvc.cgi/php-src/ext/pdo/pdo.c?r1=1.57.2.17.2.6&r2=1.57.2.17.2.7&diff_format=u Index: php-src/ext/pdo/pdo.c diff -u php-src/ext/pdo/pdo.c:1.57.2.17.2.6 php-src/ext/pdo/pdo.c:1.57.2.17.2.7 --- php-src/ext/pdo/pdo.c:1.57.2.17.2.6 Thu Jun 15 18:33:08 2006 +++ php-src/ext/pdo/pdo.c Sat Oct 14 15:06:11 2006 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: pdo.c,v 1.57.2.17.2.6 2006/06/15 18:33:08 dmitry Exp $ */ +/* $Id: pdo.c,v 1.57.2.17.2.7 2006/10/14 15:06:11 bjori Exp $ */ #ifdef HAVE_CONFIG_H #include "config.h" @@ -162,12 +162,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) { @@ -326,8 +320,6 @@ spl_ce_RuntimeException = NULL; - REGISTER_INI_ENTRIES(); - if (FAILURE == pdo_sqlstate_init_error_table()) { return FAILURE; } @@ -353,7 +345,6 @@ /* {{{ 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_info_print_table_end(); -#if 0 - DISPLAY_INI_ENTRIES(); -#endif } /* }}} */ http://cvs.php.net/viewvc.cgi/php-src/php.ini-recommended?r1=1.179.2.11.2.11&r2=1.179.2.11.2.12&diff_format=u Index: php-src/php.ini-recommended diff -u php-src/php.ini-recommended:1.179.2.11.2.11 php-src/php.ini-recommended:1.179.2.11.2.12 --- php-src/php.ini-recommended:1.179.2.11.2.11 Thu Sep 28 19:44:04 2006 +++ php-src/php.ini-recommended Sat Oct 14 15:06:11 2006 @@ -686,9 +686,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.231.2.10.2.11&r2=1.231.2.10.2.12&diff_format=u Index: php-src/php.ini-dist diff -u php-src/php.ini-dist:1.231.2.10.2.11 php-src/php.ini-dist:1.231.2.10.2.12 --- php-src/php.ini-dist:1.231.2.10.2.11 Thu Sep 28 19:37:59 2006 +++ php-src/php.ini-dist Sat Oct 14 15:06:11 2006 @@ -641,9 +641,6 @@ ;iconv.internal_encoding = ISO-8859-1 ;iconv.output_encoding = ISO-8859-1 -[pdo] -;pdo.global_value = 41 - [sqlite] ;sqlite.assoc_case = 0