hcq/MaxScale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix minor filter problems

Browse Source 
Regexfilter tried to retrieve wrong parameter and the `options` parameter
was not added to the filters.
This commit is contained in:
Markus Mäkelä
2017-01-09 14:53:21 +02:00
parent da5d53bbe0
commit 2ee257eb48
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
server/core/config.c
View File

@ -3041,15 +3041,9 @@ int create_new_filter(CONFIG_CONTEXT *obj)
error_count++; error_count++;
} }
CONFIG_PARAMETER *params = obj->parameters; for (CONFIG_PARAMETER *p = obj->parameters; p; p = p->next)
while (params)
{ {
if (strcmp(params->name, "module") && strcmp(params->name, "options")) filter_add_parameter(obj->element, p->name, p->value);
{
filter_add_parameter(obj->element, params->name, params->value);
}
params = params->next;
} }
} }
else else

2
server/modules/filter/regexfilter/regexfilter.c
View File

@ -133,7 +133,7 @@ MXS_MODULE* MXS_CREATE_MODULE()
{"user", MXS_MODULE_PARAM_STRING}, {"user", MXS_MODULE_PARAM_STRING},
{"log_trace", MXS_MODULE_PARAM_BOOL, "false"}, {"log_trace", MXS_MODULE_PARAM_BOOL, "false"},
{"log_file", MXS_MODULE_PARAM_STRING}, {"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} {MXS_END_MODULE_PARAMS}
} }
}; };