From: Hannes Magnusson <bjori@php.net>
Date: Sat, 14 Oct 2006 15:07:36 +0000 (+0000)
Subject: MFB: Remove bogus INI entry
X-Git-Tag: RELEASE_1_0_0RC1~1285
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4970ccfa0489001933a31423576680127be4a404;p=php

MFB: Remove bogus INI entry
---

diff --git a/ext/pdo/pdo.c b/ext/pdo/pdo.c
index 8dee8ea128..b4b3f202ab 100755
--- a/ext/pdo/pdo.c
+++ b/ext/pdo/pdo.c
@@ -157,12 +157,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)
 {
@@ -321,8 +315,6 @@ PHP_MINIT_FUNCTION(pdo)
 
 	spl_ce_RuntimeException = NULL;
 
-	REGISTER_INI_ENTRIES();
-
 	if (FAILURE == pdo_sqlstate_init_error_table()) {
 		return FAILURE;
 	}
@@ -348,7 +340,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;
@@ -381,9 +372,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 5d07bcb92a..687f23a1d5 100644
--- a/php.ini-dist
+++ b/php.ini-dist
@@ -567,9 +567,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 36b38841a1..e3829e513b 100644
--- a/php.ini-recommended
+++ b/php.ini-recommended
@@ -598,9 +598,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