X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=loadcfg.c;h=d7f9db62fa8467170cf2656d2024ef53ad7717a7;hb=4744a1b232e734211c2d6860c80be7d59c7043d0;hp=82ef8d2c787b8944fc5b93778f17f97aedfa2053;hpb=dde30f5e8bb12c63688330c97fde75493f92c09c;p=privoxy.git

diff --git a/loadcfg.c b/loadcfg.c
index 82ef8d2c..d7f9db62 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.117 2011/07/08 13:30:08 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.120 2011/07/19 11:00:20 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -231,7 +231,7 @@ static void unload_configfile (void * data)
 
    for (i = 0; i < MAX_LISTENING_SOCKETS; i++)
    {
-       freez(config->haddr[i]);
+      freez(config->haddr[i]);
    }
    freez(config->logfile);
 
@@ -1525,14 +1525,14 @@ struct configuration_spec * load_config(void)
       log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
    }
 
-   if (config->actions_file[0])
+   if (config->re_filterfile[0])
    {
-      add_loader(load_action_files, config);
+      add_loader(load_re_filterfiles, config);
    }
 
-   if (config->re_filterfile[0])
+   if (config->actions_file[0])
    {
-      add_loader(load_re_filterfiles, config);
+      add_loader(load_action_files, config);
    }
 
 #ifdef FEATURE_TRUST
@@ -1551,7 +1551,7 @@ struct configuration_spec * load_config(void)
       }
    }
 
-   for (i = 0; i < MAX_LISTENING_SOCKETS && NULL != config->haddr[i]; i++ )
+   for (i = 0; i < MAX_LISTENING_SOCKETS && NULL != config->haddr[i]; i++)
    {
       if ((*config->haddr[i] == '[')
          && (NULL != (p = strchr(config->haddr[i], ']')))