From be7df664847ca44eb41056d36095eb75f9c50bcd Mon Sep 17 00:00:00 2001 From: Vsevolod Stakhov Date: Thu, 23 Jul 2009 20:22:00 +0400 Subject: [PATCH] * Fix some more bugs --- src/cfg_file.h | 1 - src/cfg_utils.c | 1 + src/main.c | 4 ++-- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/cfg_file.h b/src/cfg_file.h index d93bc9d34..44e9421b0 100644 --- a/src/cfg_file.h +++ b/src/cfg_file.h @@ -10,7 +10,6 @@ #include "mem_pool.h" #include "upstream.h" #include "memcached.h" -#include "filter.h" #define DEFAULT_BIND_PORT 768 #define DEFAULT_CONTROL_PORT 7608 diff --git a/src/cfg_utils.c b/src/cfg_utils.c index 30318ffda..6b095e6d8 100644 --- a/src/cfg_utils.c +++ b/src/cfg_utils.c @@ -413,6 +413,7 @@ parse_filters_str (struct config_file *cfg, const char *str) cur = NULL; /* Search modules from known C modules */ for (i = 0; i < MODULES_NUM; i++) { + g_strstrip (*p); if (strcasecmp (modules[i].name, *p) == 0) { cur = memory_pool_alloc (cfg->cfg_pool, sizeof (struct filter)); cur->type = C_FILTER; diff --git a/src/main.c b/src/main.c index 2ff31ecfc..00cf68203 100644 --- a/src/main.c +++ b/src/main.c @@ -543,7 +543,7 @@ main (int argc, char **argv, char **env) while (l) { filt = l->data; if (filt->module) { - if (filt->module->module_config_func (cfg)) { + if (!filt->module->module_config_func (cfg)) { res = FALSE; } } @@ -655,7 +655,7 @@ main (int argc, char **argv, char **env) while (l) { filt = l->data; if (filt->module) { - if (filt->module->module_config_func (cfg)) { + if (!filt->module->module_config_func (cfg)) { res = FALSE; } } -- 2.39.5