diff options
| -rw-r--r-- | src/sp_config_keywords.c | 8 | ||||
| -rw-r--r-- | src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/sp_config_keywords.c b/src/sp_config_keywords.c index c3a9c19..7d9fbdf 100644 --- a/src/sp_config_keywords.c +++ b/src/sp_config_keywords.c | |||
| @@ -378,11 +378,11 @@ int parse_disabled_functions(char *line) { | |||
| 378 | return 1; \ | 378 | return 1; \ |
| 379 | } | 379 | } |
| 380 | 380 | ||
| 381 | MUTUALLY_EXCLUSIVE(df->value, df->r_value, "value", "regexp"); | 381 | MUTUALLY_EXCLUSIVE(df->r_value, df->value, "r_value", "value"); |
| 382 | MUTUALLY_EXCLUSIVE(df->r_function, df->function, "r_function", "function"); | 382 | MUTUALLY_EXCLUSIVE(df->r_function, df->function, "r_function", "function"); |
| 383 | MUTUALLY_EXCLUSIVE(df->filename, df->r_filename, "r_filename", "filename"); | 383 | MUTUALLY_EXCLUSIVE(df->r_filename, df->filename, "r_filename", "filename"); |
| 384 | MUTUALLY_EXCLUSIVE(df->ret, df->r_ret, "r_ret", "ret"); | 384 | MUTUALLY_EXCLUSIVE(df->r_ret, df->ret, "r_ret", "ret"); |
| 385 | MUTUALLY_EXCLUSIVE(df->key, df->r_key, "r_key", "key"); | 385 | MUTUALLY_EXCLUSIVE(df->r_key, df->key, "r_key", "key"); |
| 386 | #undef MUTUALLY_EXCLUSIVE | 386 | #undef MUTUALLY_EXCLUSIVE |
| 387 | 387 | ||
| 388 | if (1 < | 388 | if (1 < |
diff --git a/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt index ccbcc6e..44ef0aa 100644 --- a/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt +++ b/src/tests/broken_configuration/broken_conf_mutually_exclusive.phpt | |||
| @@ -6,6 +6,6 @@ Broken configuration | |||
| 6 | sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive.ini | 6 | sp.configuration_file={PWD}/config/broken_conf_mutually_exclusive.ini |
| 7 | --FILE-- | 7 | --FILE-- |
| 8 | --EXPECT-- | 8 | --EXPECT-- |
| 9 | PHP Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 | 9 | PHP Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.r_value' and '.value' are mutually exclusive on line 1 in Unknown on line 0 |
| 10 | 10 | ||
| 11 | Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.value' and '.regexp' are mutually exclusive on line 1 in Unknown on line 0 \ No newline at end of file | 11 | Fatal error: [snuffleupagus][0.0.0.0][config][log] Invalid configuration line: 'sp.disabled_functions.function("system").param("id").value("42").value_r("^id$").drop();': '.r_value' and '.value' are mutually exclusive on line 1 in Unknown on line 0 |