From: Fabian Keil <fk@fabiankeil.de>
Date: Sun, 8 Feb 2009 19:18:57 +0000 (+0000)
Subject: Now that we have the match-all.action file, the other action
X-Git-Tag: v_3_0_11~87
X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=commitdiff_plain;h=58b518549b4cad7b89e2e87def5169d83ceb2d45;hp=89c571890a7f2ba82241d297abb5bdc462f21799

Now that we have the match-all.action file, the other action
files changed their position in config->actions_file[] back
to the way it was before standard.action got removed and the
changes from revision 1.84 have to be reverted.
---

diff --git a/loadcfg.c b/loadcfg.c
index efb6c7d2..d1d95aea 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.84 2009/01/14 16:14:36 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.85 2009/01/22 12:06:26 fabiankeil Exp $";
 /*********************************************************************
  *
  * File        :  $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -35,6 +35,9 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.84 2009/01/14 16:14:36 fabiankeil
  *
  * Revisions   :
  *    $Log: loadcfg.c,v $
+ *    Revision 1.85  2009/01/22 12:06:26  fabiankeil
+ *    Don't keep connections alive when running single-threaded.
+ *
  *    Revision 1.84  2009/01/14 16:14:36  fabiankeil
  *    Due to the standard.action file removal, the other action
  *    files changed their position in config->actions_file[].
@@ -1836,8 +1839,8 @@ struct configuration_spec * load_config(void)
 /* FIXME: this is a kludge for win32 */
 #if defined(_WIN32) && !defined (_WIN_CONSOLE)
 
-   g_default_actions_file  = config->actions_file[0]; /* FIXME Hope this is default.action */
-   g_user_actions_file = config->actions_file[1]; /* FIXME Hope this is user.action */
+   g_default_actions_file = config->actions_file[1]; /* FIXME Hope this is default.action */
+   g_user_actions_file = config->actions_file[2]; /* FIXME Hope this is user.action */
    g_re_filterfile    = config->re_filterfile[0]; /* FIXME Hope this is default.filter */
 
 #ifdef FEATURE_TRUST