Remove bogus ini entry

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 1e78952d0c013057ce1b9860bf5ec2e1202087d4..2106e7d407d143ed72d8e279cb7b8adae954a406 100755 (executable)
--- 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 3e00ea39de9b0128327ac627f1b8b1d34346c8cc..4fee3fee800775141e1b0330fe9f807b36b7e990 100644 (file)
--- 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 9de3a1cd5bc26b8d184f80093175f96b08258316..b2a640af9c95649970b1fdcf94c8a9c86ff875ef 100644 (file)
--- 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