Mirrors
/
php
mirror of https://github.com/php/php-src
3
0
Fork 0
Code Releases Activity
Browse Source

added verbose ini entry

experimental/pre_new_hash_func
Harald Radi 25 years ago
parent
2c95a1d690
commit
4a29944dac
2 changed files with 4 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 3
      ext/com/COM.c
  2. 3
      ext/rpc/com/com_wrapper.c

3
ext/com/COM.c
View File

@ -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);
}

3
ext/rpc/com/com_wrapper.c
View File

@ -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);
}

Write Preview
Loading…
Cancel
Save