* Fix some more bugs

diff --git a/src/cfg_file.h b/src/cfg_file.h
index d93bc9d34d1a7bbc76c0a03a70862fb9dda28d92..44e9421b03e9f2806f3c7d95e667c4f7bb26fb0b 100644 (file)
--- 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 30318ffda08eb2a72f523cdc80cf21aa326d2770..6b095e6d89385c1ed11d48d46d8b70444eda10de 100644 (file)
--- 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 2ff31ecfc43a252a27261cfd8597f3ac3ab88ff3..00cf6820360454f8037c727169aaee761fa510f5 100644 (file)
--- 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;
                        }
                }