From 2ee257eb48b85f0a97f1c9a9eaee8f33216914d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Mon, 9 Jan 2017 14:53:21 +0200 Subject: [PATCH] Fix minor filter problems Regexfilter tried to retrieve wrong parameter and the `options` parameter was not added to the filters. --- server/core/config.c | 10 ++-------- server/modules/filter/regexfilter/regexfilter.c | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/server/core/config.c b/server/core/config.c index 189c80878..de25a4b78 100644 --- a/server/core/config.c +++ b/server/core/config.c @@ -3041,15 +3041,9 @@ int create_new_filter(CONFIG_CONTEXT *obj) error_count++; } - CONFIG_PARAMETER *params = obj->parameters; - - while (params) + for (CONFIG_PARAMETER *p = obj->parameters; p; p = p->next) { - if (strcmp(params->name, "module") && strcmp(params->name, "options")) - { - filter_add_parameter(obj->element, params->name, params->value); - } - params = params->next; + filter_add_parameter(obj->element, p->name, p->value); } } else diff --git a/server/modules/filter/regexfilter/regexfilter.c b/server/modules/filter/regexfilter/regexfilter.c index 670477162..6a6daae21 100644 --- a/server/modules/filter/regexfilter/regexfilter.c +++ b/server/modules/filter/regexfilter/regexfilter.c @@ -133,7 +133,7 @@ MXS_MODULE* MXS_CREATE_MODULE() {"user", MXS_MODULE_PARAM_STRING}, {"log_trace", MXS_MODULE_PARAM_BOOL, "false"}, {"log_file", MXS_MODULE_PARAM_STRING}, - {"option", MXS_MODULE_PARAM_ENUM, "ignorecase", MXS_MODULE_OPT_NONE, option_values}, + {"options", MXS_MODULE_PARAM_ENUM, "ignorecase", MXS_MODULE_OPT_NONE, option_values}, {MXS_END_MODULE_PARAMS} } };