X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=56f2938ca1c831c46bdc84f4d969279bc63af7ed;hp=d3b4a2b073fae29eb49eee097fe7d3e0de3d8f70;hb=bf18b40dd30e0c16392285408cad379c2ead11d7;hpb=8ef1cce0e3dfe6b68730d19d68cbb628219ebf39
diff --git a/loadcfg.c b/loadcfg.c
index d3b4a2b0..56f2938c 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.78 2008/08/02 08:23:22 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.88 2009/02/28 10:57:10 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.78 2008/08/02 08:23:22 fabiankeil
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2008 the SourceForge
+ * Copyright : Written by and Copyright (C) 2001-2009 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -35,6 +35,48 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.78 2008/08/02 08:23:22 fabiankeil
*
* Revisions :
* $Log: loadcfg.c,v $
+ * Revision 1.88 2009/02/28 10:57:10 fabiankeil
+ * Gimme a break or two. Don't let the show-status page
+ * link to the website documentation for the user-manual
+ * directive itself.
+ *
+ * Revision 1.87 2009/02/15 07:56:13 fabiankeil
+ * Increase default socket timeout to 300 seconds.
+ *
+ * Revision 1.86 2009/02/08 19:18:57 fabiankeil
+ * 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.
+ *
+ * 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[].
+ * Update mingw32 kludge accordingly.
+ *
+ * Revision 1.83 2008/12/20 14:53:55 fabiankeil
+ * Add config option socket-timeout to control the time
+ * Privoxy waits for data to arrive on a socket. Useful
+ * in case of stale ssh tunnels or when fuzz-testing.
+ *
+ * Revision 1.82 2008/11/16 12:43:49 fabiankeil
+ * Turn keep-alive support into a runtime feature
+ * that is disabled by setting keep-alive-timeout
+ * to a negative value.
+ *
+ * Revision 1.81 2008/11/13 09:08:42 fabiankeil
+ * Add new config option: keep-alive-timeout.
+ *
+ * Revision 1.80 2008/08/31 15:59:03 fabiankeil
+ * There's no reason to let remote toggling support depend
+ * on FEATURE_CGI_EDIT_ACTIONS, so make sure it doesn't.
+ *
+ * Revision 1.79 2008/08/30 12:03:07 fabiankeil
+ * Remove FEATURE_COOKIE_JAR.
+ *
* Revision 1.78 2008/08/02 08:23:22 fabiankeil
* If the enforce-blocks directive is used with FEATURE_FORCE_LOAD
* disabled, log a message that blocks will always be enforced
@@ -501,6 +543,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.78 2008/08/02 08:23:22 fabiankeil
#include "encode.h"
#include "urlmatch.h"
#include "cgi.h"
+#include "gateway.h"
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
@@ -564,12 +607,14 @@ static struct file_list *current_configfile = NULL;
#define hash_forward_socks5 3963965522ul /* "forward-socks5" */
#define hash_forwarded_connect_retries 101465292ul /* "forwarded-connect-retries" */
#define hash_hostname 10308071ul /* "hostname" */
+#define hash_keep_alive_timeout 3878599515ul /* "keep-alive-timeout" */
#define hash_listen_address 1255650842ul /* "listen-address" */
#define hash_logdir 422889ul /* "logdir" */
#define hash_logfile 2114766ul /* "logfile" */
#define hash_permit_access 3587953268ul /* "permit-access" */
#define hash_proxy_info_url 3903079059ul /* "proxy-info-url" */
#define hash_single_threaded 4250084780ul /* "single-threaded" */
+#define hash_socket_timeout 1809001761ul /* "socket-timeout" */
#define hash_split_large_cgi_forms 671658948ul /* "split-large-cgi-forms" */
#define hash_suppress_blocklists 1948693308ul /* "suppress-blocklists" */
#define hash_templdir 11067889ul /* "templdir" */
@@ -717,16 +762,20 @@ struct configuration_spec * load_config(void)
unsigned long linenum = 0;
int i;
char *logfile = NULL;
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ int keep_alive_timeout = DEFAULT_KEEP_ALIVE_TIMEOUT;
+#endif
- if ( !check_file_changed(current_configfile, configfile, &fs))
+ if (!check_file_changed(current_configfile, configfile, &fs))
{
/* No need to load */
return ((struct configuration_spec *)current_configfile->f);
}
- if (!fs)
+ if (NULL == fs)
{
- log_error(LOG_LEVEL_FATAL, "can't check configuration file '%s': %E",
- configfile);
+ log_error(LOG_LEVEL_FATAL,
+ "can't check configuration file '%s': %E", configfile);
+ return NULL;
}
if (NULL != current_configfile)
@@ -735,17 +784,17 @@ struct configuration_spec * load_config(void)
}
#ifdef FEATURE_TOGGLE
- global_toggle_state = 1;
+ global_toggle_state = 1;
#endif /* def FEATURE_TOGGLE */
fs->f = config = (struct configuration_spec *)zalloc(sizeof(*config));
- if (config==NULL)
+ if (NULL == config)
{
freez(fs->filename);
freez(fs);
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
- /* Never get here - LOG_LEVEL_FATAL causes program exit */
+ return NULL;
}
/*
@@ -768,14 +817,16 @@ struct configuration_spec * load_config(void)
config->usermanual = strdup(USER_MANUAL_URL);
config->proxy_args = strdup("");
config->forwarded_connect_retries = 0;
+ config->socket_timeout = 300; /* XXX: Should be a macro. */
config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE;
config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
- if ((configfp = fopen(configfile, "r")) == NULL)
+ configfp = fopen(configfile, "r");
+ if (NULL == configfp)
{
- log_error(LOG_LEVEL_FATAL, "can't open configuration file '%s': %E",
- configfile);
+ log_error(LOG_LEVEL_FATAL,
+ "can't open configuration file '%s': %E", configfile);
/* Never get here - LOG_LEVEL_FATAL causes program exit */
}
@@ -819,7 +870,7 @@ struct configuration_spec * load_config(void)
}
/* Make sure the command field is lower case */
- for (p=cmd; *p; p++)
+ for (p = cmd; *p; p++)
{
if (ijb_isupper(*p))
{
@@ -827,9 +878,6 @@ struct configuration_spec * load_config(void)
}
}
- /* Save the argument for show-proxy-args */
- savearg(cmd, arg, config);
-
directive_hash = hash_string(cmd);
switch (directive_hash)
{
@@ -853,7 +901,7 @@ struct configuration_spec * load_config(void)
config->actions_file_short[i] = strdup(arg);
config->actions_file[i] = make_path(config->confdir, arg);
- continue;
+ break;
/* *************************************************************************
* accept-intercepted-requests
* *************************************************************************/
@@ -866,7 +914,7 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
}
- continue;
+ break;
/* *************************************************************************
* admin-address email-address
@@ -874,7 +922,7 @@ struct configuration_spec * load_config(void)
case hash_admin_address :
freez(config->admin_address);
config->admin_address = strdup(arg);
- continue;
+ break;
/* *************************************************************************
* allow-cgi-request-crunching
@@ -888,14 +936,14 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_CGI_CRUNCHING;
}
- continue;
+ break;
/* *************************************************************************
* buffer-limit n
* *************************************************************************/
case hash_buffer_limit :
config->buffer_limit = (size_t)(1024 * atoi(arg));
- continue;
+ break;
/* *************************************************************************
* confdir directory-name
@@ -903,7 +951,7 @@ struct configuration_spec * load_config(void)
case hash_confdir :
freez(config->confdir);
config->confdir = make_path( NULL, arg);
- continue;
+ break;
/* *************************************************************************
* debug n
@@ -911,14 +959,15 @@ struct configuration_spec * load_config(void)
* *************************************************************************/
case hash_debug :
config->debug |= atoi(arg);
- continue;
+ break;
/* *************************************************************************
* deny-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
* *************************************************************************/
#ifdef FEATURE_ACL
case hash_deny_access:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+ strlcpy(tmp, arg, sizeof(tmp));
+ vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
if ((vec_count != 1) && (vec_count != 2))
{
@@ -927,7 +976,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"deny-access directive in configuration file.
\n");
- continue;
+ break;
}
/* allocate a new node */
@@ -937,7 +986,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
- continue;
+ break;
}
cur_acl->action = ACL_DENY;
@@ -953,7 +1002,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
- continue;
+ break;
}
if (vec_count == 2)
{
@@ -969,7 +1018,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
- continue;
+ break;
}
}
@@ -985,7 +1034,7 @@ struct configuration_spec * load_config(void)
cur_acl->next = config->acl;
config->acl = cur_acl;
- continue;
+ break;
#endif /* def FEATURE_ACL */
/* *************************************************************************
@@ -1001,13 +1050,13 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_CGI_EDIT_ACTIONS;
}
- continue;
+ break;
#endif /* def FEATURE_CGI_EDIT_ACTIONS */
/* *************************************************************************
* enable-remote-toggle 0|1
* *************************************************************************/
-#ifdef FEATURE_CGI_EDIT_ACTIONS
+#ifdef FEATURE_TOGGLE
case hash_enable_remote_toggle:
if ((*arg != '\0') && (0 != atoi(arg)))
{
@@ -1017,8 +1066,8 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_CGI_TOGGLE;
}
- continue;
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+ break;
+#endif /* def FEATURE_TOGGLE */
/* *************************************************************************
* enable-remote-http-toggle 0|1
@@ -1032,7 +1081,7 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_HTTP_TOGGLE;
}
- continue;
+ break;
/* *************************************************************************
* enforce-blocks 0|1
@@ -1051,7 +1100,7 @@ struct configuration_spec * load_config(void)
log_error(LOG_LEVEL_ERROR, "Ignoring directive 'enforce-blocks'. "
"FEATURE_FORCE_LOAD is disabled, blocks will always be enforced.");
#endif /* def FEATURE_FORCE_LOAD */
- continue;
+ break;
/* *************************************************************************
* filterfile file-name
@@ -1073,13 +1122,14 @@ struct configuration_spec * load_config(void)
config->re_filterfile_short[i] = strdup(arg);
config->re_filterfile[i] = make_path(config->confdir, arg);
- continue;
+ break;
/* *************************************************************************
* forward url-pattern (.|http-proxy-host[:port])
* *************************************************************************/
case hash_forward:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+ strlcpy(tmp, arg, sizeof(tmp));
+ vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
if (vec_count != 2)
{
@@ -1088,7 +1138,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward directive in configuration file.");
- continue;
+ break;
}
/* allocate a new node */
@@ -1097,7 +1147,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
- continue;
+ break;
}
cur_fwd->type = SOCKS_NONE;
@@ -1110,7 +1160,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
- continue;
+ break;
}
/* Parse the parent HTTP proxy host:port */
@@ -1136,13 +1186,14 @@ struct configuration_spec * load_config(void)
cur_fwd->next = config->forward;
config->forward = cur_fwd;
- continue;
+ break;
/* *************************************************************************
* forward-socks4 url-pattern socks-proxy[:port] (.|http-proxy[:port])
* *************************************************************************/
case hash_forward_socks4:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+ strlcpy(tmp, arg, sizeof(tmp));
+ vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
if (vec_count != 3)
{
@@ -1151,7 +1202,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward-socks4 directive in configuration file.");
- continue;
+ break;
}
/* allocate a new node */
@@ -1160,7 +1211,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
- continue;
+ break;
}
cur_fwd->type = SOCKS_4;
@@ -1173,7 +1224,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
- continue;
+ break;
}
/* Parse the SOCKS proxy host[:port] */
@@ -1217,14 +1268,15 @@ struct configuration_spec * load_config(void)
cur_fwd->next = config->forward;
config->forward = cur_fwd;
- continue;
+ break;
/* *************************************************************************
* forward-socks4a url-pattern socks-proxy[:port] (.|http-proxy[:port])
* *************************************************************************/
case hash_forward_socks4a:
case hash_forward_socks5:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+ strlcpy(tmp, arg, sizeof(tmp));
+ vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
if (vec_count != 3)
{
@@ -1233,7 +1285,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Wrong number of parameters for "
"forward-socks4a directive in configuration file.");
- continue;
+ break;
}
/* allocate a new node */
@@ -1242,7 +1294,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
- continue;
+ break;
}
if (directive_hash == hash_forward_socks4a)
@@ -1262,7 +1314,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4a directive in configuration file.");
- continue;
+ break;
}
/* Parse the SOCKS proxy host[:port] */
@@ -1303,14 +1355,14 @@ struct configuration_spec * load_config(void)
cur_fwd->next = config->forward;
config->forward = cur_fwd;
- continue;
+ break;
/* *************************************************************************
* forwarded-connect-retries n
* *************************************************************************/
case hash_forwarded_connect_retries :
config->forwarded_connect_retries = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* hostname hostname-to-show-on-cgi-pages
@@ -1322,7 +1374,28 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "Out of memory saving hostname.");
}
- continue;
+ break;
+
+/* *************************************************************************
+ * keep-alive-timeout timeout
+ * *************************************************************************/
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ case hash_keep_alive_timeout :
+ if (*arg != '\0')
+ {
+ int timeout = atoi(arg);
+ if (0 <= timeout)
+ {
+ config->feature_flags |= RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ keep_alive_timeout = timeout;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ }
+ }
+ break;
+#endif
/* *************************************************************************
* listen-address [ip][:port]
@@ -1330,7 +1403,7 @@ struct configuration_spec * load_config(void)
case hash_listen_address :
freez(config->haddr);
config->haddr = strdup(arg);
- continue;
+ break;
/* *************************************************************************
* logdir directory-name
@@ -1338,7 +1411,7 @@ struct configuration_spec * load_config(void)
case hash_logdir :
freez(config->logdir);
config->logdir = make_path(NULL, arg);
- continue;
+ break;
/* *************************************************************************
* logfile log-file-name
@@ -1353,14 +1426,15 @@ struct configuration_spec * load_config(void)
log_error(LOG_LEVEL_FATAL, "Out of memory while creating logfile path");
}
}
- continue;
+ break;
/* *************************************************************************
* permit-access source-ip[/significant-bits] [dest-ip[/significant-bits]]
* *************************************************************************/
#ifdef FEATURE_ACL
case hash_permit_access:
- vec_count = ssplit(arg, " \t", vec, SZ(vec), 1, 1);
+ strlcpy(tmp, arg, sizeof(tmp));
+ vec_count = ssplit(tmp, " \t", vec, SZ(vec), 1, 1);
if ((vec_count != 1) && (vec_count != 2))
{
@@ -1370,7 +1444,7 @@ struct configuration_spec * load_config(void)
"
\nWARNING: Wrong number of parameters for "
"permit-access directive in configuration file.
\n");
- continue;
+ break;
}
/* allocate a new node */
@@ -1380,7 +1454,7 @@ struct configuration_spec * load_config(void)
{
log_error(LOG_LEVEL_FATAL, "can't allocate memory for configuration");
/* Never get here - LOG_LEVEL_FATAL causes program exit */
- continue;
+ break;
}
cur_acl->action = ACL_PERMIT;
@@ -1396,7 +1470,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
- continue;
+ break;
}
if (vec_count == 2)
{
@@ -1412,7 +1486,7 @@ struct configuration_spec * load_config(void)
string_append(&config->proxy_args,
"\"
\n");
freez(cur_acl);
- continue;
+ break;
}
}
@@ -1428,7 +1502,7 @@ struct configuration_spec * load_config(void)
cur_acl->next = config->acl;
config->acl = cur_acl;
- continue;
+ break;
#endif /* def FEATURE_ACL */
/* *************************************************************************
@@ -1437,14 +1511,33 @@ struct configuration_spec * load_config(void)
case hash_proxy_info_url :
freez(config->proxy_info_url);
config->proxy_info_url = strdup(arg);
- continue;
+ break;
/* *************************************************************************
* single-threaded
* *************************************************************************/
case hash_single_threaded :
config->multi_threaded = 0;
- continue;
+ break;
+
+/* *************************************************************************
+ * socket-timeout numer_of_seconds
+ * *************************************************************************/
+ case hash_socket_timeout :
+ if (*arg != '\0')
+ {
+ int socket_timeout = atoi(arg);
+ if (0 < socket_timeout)
+ {
+ config->socket_timeout = socket_timeout;
+ }
+ else
+ {
+ log_error(LOG_LEVEL_FATAL,
+ "Invalid socket-timeout: '%s'", arg);
+ }
+ }
+ break;
/* *************************************************************************
* split-large-cgi-forms
@@ -1458,7 +1551,7 @@ struct configuration_spec * load_config(void)
{
config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
}
- continue;
+ break;
/* *************************************************************************
* templdir directory-name
@@ -1466,7 +1559,7 @@ struct configuration_spec * load_config(void)
case hash_templdir :
freez(config->templdir);
config->templdir = make_path(NULL, arg);
- continue;
+ break;
/* *************************************************************************
* toggle (0|1)
@@ -1474,7 +1567,7 @@ struct configuration_spec * load_config(void)
#ifdef FEATURE_TOGGLE
case hash_toggle :
global_toggle_state = atoi(arg);
- continue;
+ break;
#endif /* def FEATURE_TOGGLE */
/* *************************************************************************
@@ -1483,7 +1576,7 @@ struct configuration_spec * load_config(void)
#ifdef FEATURE_TRUST
case hash_trust_info_url :
enlist(config->trust_info, arg);
- continue;
+ break;
#endif /* def FEATURE_TRUST */
/* *************************************************************************
@@ -1494,16 +1587,21 @@ struct configuration_spec * load_config(void)
case hash_trustfile :
freez(config->trustfile);
config->trustfile = make_path(config->confdir, arg);
- continue;
+ break;
#endif /* def FEATURE_TRUST */
/* *************************************************************************
* usermanual url
* *************************************************************************/
case hash_usermanual :
+ /*
+ * XXX: If this isn't the first config directive, the
+ * show-status page links to the website documentation
+ * for the directives that were already parsed. Lame.
+ */
freez(config->usermanual);
config->usermanual = strdup(arg);
- continue;
+ break;
/* *************************************************************************
* Win32 Console options:
@@ -1515,7 +1613,7 @@ struct configuration_spec * load_config(void)
#ifdef _WIN_CONSOLE
case hash_hide_console :
hideConsole = 1;
- continue;
+ break;
#endif /*def _WIN_CONSOLE*/
@@ -1529,63 +1627,63 @@ struct configuration_spec * load_config(void)
* *************************************************************************/
case hash_activity_animation :
g_bShowActivityAnimation = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* close-button-minimizes (0|1)
* *************************************************************************/
case hash_close_button_minimizes :
g_bCloseHidesWindow = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* log-buffer-size (0|1)
* *************************************************************************/
case hash_log_buffer_size :
g_bLimitBufferSize = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* log-font-name fontnane
* *************************************************************************/
case hash_log_font_name :
strcpy( g_szFontFaceName, arg );
- continue;
+ break;
/* *************************************************************************
* log-font-size n
* *************************************************************************/
case hash_log_font_size :
g_nFontSize = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* log-highlight-messages (0|1)
* *************************************************************************/
case hash_log_highlight_messages :
g_bHighlightMessages = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* log-max-lines n
* *************************************************************************/
case hash_log_max_lines :
g_nMaxBufferLines = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* log-messages (0|1)
* *************************************************************************/
case hash_log_messages :
g_bLogMessages = atoi(arg);
- continue;
+ break;
/* *************************************************************************
* show-on-task-bar (0|1)
* *************************************************************************/
case hash_show_on_task_bar :
g_bShowOnTaskBar = atoi(arg);
- continue;
+ break;
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */
@@ -1598,8 +1696,10 @@ struct configuration_spec * load_config(void)
#endif /* ndef FEATURE_ACL */
#ifndef FEATURE_CGI_EDIT_ACTIONS
case hash_enable_edit_actions:
+#endif /* ndef FEATURE_CGI_EDIT_ACTIONS */
+#ifndef FEATURE_TOGGLE
case hash_enable_remote_toggle:
-#endif /* def FEATURE_CGI_EDIT_ACTIONS */
+#endif /* ndef FEATURE_TOGGLE */
#ifndef FEATURE_ACL
case hash_permit_access:
#endif /* ndef FEATURE_ACL */
@@ -1628,7 +1728,7 @@ struct configuration_spec * load_config(void)
#endif /* defined(_WIN_CONSOLE) || ! defined(_WIN32) */
/* These warnings are annoying - so hide them. -- Jon */
/* log_error(LOG_LEVEL_INFO, "Unsupported directive \"%s\" ignored.", cmd); */
- continue;
+ break;
/* *************************************************************************/
default :
@@ -1642,10 +1742,14 @@ struct configuration_spec * load_config(void)
"in configuration file (%s).", buf, directive_hash, linenum, configfile);
string_append(&config->proxy_args,
" Warning: ignored unrecognized directive above.
");
- continue;
+ break;
/* *************************************************************************/
} /* end switch( hash_string(cmd) ) */
+
+ /* Save the argument for the show-status page. */
+ savearg(cmd, arg, config);
+
} /* end while ( read_config_line(...) ) */
fclose(configfp);
@@ -1667,6 +1771,28 @@ struct configuration_spec * load_config(void)
}
}
+#ifdef FEATURE_CONNECTION_KEEP_ALIVE
+ if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
+ {
+ if (config->multi_threaded)
+ {
+ set_keep_alive_timeout(keep_alive_timeout);
+ }
+ else
+ {
+ /*
+ * While we could use keep-alive without multiple threads
+ * if we didn't bother with enforcing the connection timeout,
+ * that might make Tor users sad, even though they shouldn't
+ * enable the single-threaded option anyway.
+ */
+ config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE;
+ log_error(LOG_LEVEL_ERROR,
+ "Config option single-threaded disables connection keep-alive.");
+ }
+ }
+#endif
+
if (NULL == config->proxy_args)
{
log_error(LOG_LEVEL_FATAL, "Out of memory loading config - insufficient memory for config->proxy_args");
@@ -1740,7 +1866,7 @@ 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[1]; /* FIXME Hope this is default.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 */