diff options
| author | Harald Radi <phanto@php.net> | 2001-06-24 22:20:28 +0000 |
|---|---|---|
| committer | Harald Radi <phanto@php.net> | 2001-06-24 22:20:28 +0000 |
| commit | 4a29944dac417a8c060ba2d2ad628534ed98e96b (patch) | |
| tree | 3f2df86ffad544c426277236eaa3683b75f8db59 | |
| parent | 2c95a1d690e4be16d20ca2147c5bf0421d04fec0 (diff) | |
| download | php-git-4a29944dac417a8c060ba2d2ad628534ed98e96b.tar.gz | |
added verbose ini entry
| -rw-r--r-- | ext/com/COM.c | 3 | ||||
| -rw-r--r-- | ext/rpc/com/com_wrapper.c | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ext/com/COM.c b/ext/com/COM.c index c8a8ced4f4..6bc04d922d 100644 --- a/ext/com/COM.c +++ b/ext/com/COM.c @@ -443,6 +443,7 @@ static PHP_INI_MH(OnTypelibFileChange) PHP_INI_BEGIN() PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_typelib", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) +PHP_INI_ENTRY_EX("com.autoregister_verbose", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_casesensitive", "1", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) PHP_INI_END() @@ -1640,7 +1641,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode) { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ - if (!compare_function(&results, &c.value, &exists)) + if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } diff --git a/ext/rpc/com/com_wrapper.c b/ext/rpc/com/com_wrapper.c index c8a8ced4f4..6bc04d922d 100644 --- a/ext/rpc/com/com_wrapper.c +++ b/ext/rpc/com/com_wrapper.c @@ -443,6 +443,7 @@ static PHP_INI_MH(OnTypelibFileChange) PHP_INI_BEGIN() PHP_INI_ENTRY_EX("com.allow_dcom", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_typelib", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) +PHP_INI_ENTRY_EX("com.autoregister_verbose", "0", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY_EX("com.autoregister_casesensitive", "1", PHP_INI_SYSTEM, NULL, php_ini_boolean_displayer_cb) PHP_INI_ENTRY("com.typelib_file", "", PHP_INI_SYSTEM, OnTypelibFileChange) PHP_INI_END() @@ -1640,7 +1641,7 @@ static int php_COM_load_typelib(ITypeLib *TypeLib, int mode) { /* Oops, it already exists. No problem if it is defined as the same value */ /* Check to see if they are the same */ - if (!compare_function(&results, &c.value, &exists)) + if (!compare_function(&results, &c.value, &exists) && INI_INT("com.autoregister_verbose")) { php_error(E_WARNING,"Type library value %s is already defined and has a different value", c.name); } |