X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=6550b0327b3002405e4f19b61fea01fea8d70ec5;hp=e893f77f52a64760f4b56635883e4e6b2b16409f;hb=628a8a88931fa0f2eb0bd250a17348d3a0426942;hpb=ace007919482c407568b37292a05ad56e4a47660
diff --git a/loadcfg.c b/loadcfg.c
index e893f77f..6550b032 100644
--- a/loadcfg.c
+++ b/loadcfg.c
@@ -1,4 +1,4 @@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.130 2012/07/27 17:36:06 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.141 2014/06/02 06:22:21 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@ -8,7 +8,7 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.130 2012/07/27 17:36:06 fabiankei
* routine to load the configuration and the global
* variables it writes to.
*
- * Copyright : Written by and Copyright (C) 2001-2009 the
+ * Copyright : Written by and Copyright (C) 2001-2014 the
* Privoxy team. http://www.privoxy.org/
*
* Based on the Internet Junkbuster originally written
@@ -132,6 +132,7 @@ static struct file_list *current_configfile = NULL;
#define hash_deny_access 1227333715U /* "deny-access" */
#define hash_enable_edit_actions 2517097536U /* "enable-edit-actions" */
#define hash_enable_compression 3943696946U /* "enable-compression" */
+#define hash_enable_proxy_authentication_forwarding 4040610791U /* enable-proxy-authentication-forwarding */
#define hash_enable_remote_toggle 2979744683U /* "enable-remote-toggle" */
#define hash_enable_remote_http_toggle 110543988U /* "enable-remote-http-toggle" */
#define hash_enforce_blocks 1862427469U /* "enforce-blocks" */
@@ -140,6 +141,7 @@ static struct file_list *current_configfile = NULL;
#define hash_forward_socks4 3963965521U /* "forward-socks4" */
#define hash_forward_socks4a 2639958518U /* "forward-socks4a" */
#define hash_forward_socks5 3963965522U /* "forward-socks5" */
+#define hash_forward_socks5t 2639958542U /* "forward-socks5t" */
#define hash_forwarded_connect_retries 101465292U /* "forwarded-connect-retries" */
#define hash_handle_as_empty_returns_ok 1444873247U /* "handle-as-empty-doc-returns-ok" */
#define hash_hostname 10308071U /* "hostname" */
@@ -155,6 +157,8 @@ static struct file_list *current_configfile = NULL;
#define hash_split_large_cgi_forms 671658948U /* "split-large-cgi-forms" */
#define hash_suppress_blocklists 1948693308U /* "suppress-blocklists" */
#define hash_templdir 11067889U /* "templdir" */
+#define hash_temporary_directory 1824125181U /* "temporary-directory" */
+#define hash_tolerate_pipelining 1360286620U /* "tolerate-pipelining" */
#define hash_toggle 447966U /* "toggle" */
#define hash_trust_info_url 430331967U /* "trust-info-url" */
#define hash_trustfile 56494766U /* "trustfile" */
@@ -206,7 +210,7 @@ static void unload_configfile (void * data)
while (cur_fwd != NULL)
{
struct forward_spec * next_fwd = cur_fwd->next;
- free_url_spec(cur_fwd->url);
+ free_pattern_spec(cur_fwd->url);
freez(cur_fwd->gateway_host);
freez(cur_fwd->forward_host);
@@ -219,6 +223,9 @@ static void unload_configfile (void * data)
freez(config->logdir);
freez(config->templdir);
freez(config->hostname);
+#ifdef FEATURE_EXTERNAL_FILTERS
+ freez(config->temporary_directory);
+#endif
for (i = 0; i < MAX_LISTENING_SOCKETS; i++)
{
@@ -465,7 +472,12 @@ struct configuration_spec * load_config(void)
config->usermanual = strdup(USER_MANUAL_URL);
config->proxy_args = strdup("");
config->forwarded_connect_retries = 0;
- config->max_client_connections = 0;
+ /*
+ * 128 client sockets ought to be enough for everybody who can't
+ * be bothered to read the documentation to figure out how to
+ * increase the limit.
+ */
+ config->max_client_connections = 128;
config->socket_timeout = 300; /* XXX: Should be a macro. */
#ifdef FEATURE_CONNECTION_KEEP_ALIVE
config->default_server_timeout = 0;
@@ -477,6 +489,7 @@ struct configuration_spec * load_config(void)
config->feature_flags &= ~RUNTIME_FEATURE_SPLIT_LARGE_FORMS;
config->feature_flags &= ~RUNTIME_FEATURE_ACCEPT_INTERCEPTED_REQUESTS;
config->feature_flags &= ~RUNTIME_FEATURE_EMPTY_DOC_RETURNS_OK;
+ config->feature_flags &= ~RUNTIME_FEATURE_FORWARD_PROXY_AUTHENTICATION_HEADERS;
#ifdef FEATURE_COMPRESSION
config->feature_flags &= ~RUNTIME_FEATURE_COMPRESSION;
/*
@@ -484,6 +497,7 @@ struct configuration_spec * load_config(void)
*/
config->compression_level = 1;
#endif
+ config->feature_flags &= ~RUNTIME_FEATURE_TOLERATE_PIPELINING;
configfp = fopen(configfile, "r");
if (NULL == configfp)
@@ -813,6 +827,19 @@ struct configuration_spec * load_config(void)
break;
#endif /* def FEATURE_COMPRESSION */
+/* *************************************************************************
+ * enable-proxy-authentication-forwarding 0|1
+ * *************************************************************************/
+ case hash_enable_proxy_authentication_forwarding:
+ if (parse_toggle_state(cmd, arg) == 1)
+ {
+ config->feature_flags |= RUNTIME_FEATURE_FORWARD_PROXY_AUTHENTICATION_HEADERS;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_FORWARD_PROXY_AUTHENTICATION_HEADERS;
+ }
+ break;
/* *************************************************************************
* enable-remote-toggle 0|1
@@ -914,13 +941,14 @@ struct configuration_spec * load_config(void)
cur_fwd->type = SOCKS_NONE;
/* Save the URL pattern */
- if (create_url_spec(cur_fwd->url, vec[0]))
+ if (create_pattern_spec(cur_fwd->url, vec[0]))
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward "
"directive in configuration file.");
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward directive in configuration file.");
+ freez(cur_fwd);
break;
}
@@ -969,13 +997,14 @@ struct configuration_spec * load_config(void)
cur_fwd->type = SOCKS_4;
/* Save the URL pattern */
- if (create_url_spec(cur_fwd->url, vec[0]))
+ if (create_pattern_spec(cur_fwd->url, vec[0]))
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4 "
"directive in configuration file.");
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4 directive in configuration file.");
+ freez(cur_fwd);
break;
}
@@ -1011,6 +1040,7 @@ struct configuration_spec * load_config(void)
* *************************************************************************/
case hash_forward_socks4a:
case hash_forward_socks5:
+ case hash_forward_socks5t:
strlcpy(tmp, arg, sizeof(tmp));
vec_count = ssplit(tmp, " \t", vec, SZ(vec));
@@ -1037,19 +1067,25 @@ struct configuration_spec * load_config(void)
{
cur_fwd->type = SOCKS_4A;
}
- else
+ else if (directive_hash == hash_forward_socks5)
{
cur_fwd->type = SOCKS_5;
}
+ else
+ {
+ assert(directive_hash == hash_forward_socks5t);
+ cur_fwd->type = SOCKS_5T;
+ }
/* Save the URL pattern */
- if (create_url_spec(cur_fwd->url, vec[0]))
+ if (create_pattern_spec(cur_fwd->url, vec[0]))
{
log_error(LOG_LEVEL_ERROR, "Bad URL specifier for forward-socks4a "
"directive in configuration file.");
string_append(&config->proxy_args,
"
\nWARNING: Bad URL specifier for "
"forward-socks4a directive in configuration file.");
+ freez(cur_fwd);
break;
}
@@ -1288,10 +1324,10 @@ struct configuration_spec * load_config(void)
break;
/* *************************************************************************
- * single-threaded
+ * single-threaded 0|1
* *************************************************************************/
case hash_single_threaded :
- config->multi_threaded = 0;
+ config->multi_threaded = 0 == parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
@@ -1335,12 +1371,36 @@ struct configuration_spec * load_config(void)
config->templdir = make_path(NULL, arg);
break;
+#ifdef FEATURE_EXTERNAL_FILTERS
+/* *************************************************************************
+ * temporary-directory directory-name
+ * *************************************************************************/
+ case hash_temporary_directory :
+ freez(config->temporary_directory);
+ config->temporary_directory = make_path(NULL, arg);
+ break;
+#endif
+
+/* *************************************************************************
+ * tolerate-pipelining (0|1)
+ * *************************************************************************/
+ case hash_tolerate_pipelining :
+ if (parse_toggle_state(cmd, arg) == 1)
+ {
+ config->feature_flags |= RUNTIME_FEATURE_TOLERATE_PIPELINING;
+ }
+ else
+ {
+ config->feature_flags &= ~RUNTIME_FEATURE_TOLERATE_PIPELINING;
+ }
+ break;
+
/* *************************************************************************
* toggle (0|1)
* *************************************************************************/
#ifdef FEATURE_TOGGLE
case hash_toggle :
- global_toggle_state = atoi(arg);
+ global_toggle_state = parse_toggle_state(cmd, arg);
break;
#endif /* def FEATURE_TOGGLE */
@@ -1400,21 +1460,21 @@ struct configuration_spec * load_config(void)
* activity-animation (0|1)
* *************************************************************************/
case hash_activity_animation :
- g_bShowActivityAnimation = atoi(arg);
+ g_bShowActivityAnimation = parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
* close-button-minimizes (0|1)
* *************************************************************************/
case hash_close_button_minimizes :
- g_bCloseHidesWindow = atoi(arg);
+ g_bCloseHidesWindow = parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
* log-buffer-size (0|1)
* *************************************************************************/
case hash_log_buffer_size :
- g_bLimitBufferSize = atoi(arg);
+ g_bLimitBufferSize = parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
@@ -1441,7 +1501,7 @@ struct configuration_spec * load_config(void)
* log-highlight-messages (0|1)
* *************************************************************************/
case hash_log_highlight_messages :
- g_bHighlightMessages = atoi(arg);
+ g_bHighlightMessages = parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
@@ -1455,14 +1515,14 @@ struct configuration_spec * load_config(void)
* log-messages (0|1)
* *************************************************************************/
case hash_log_messages :
- g_bLogMessages = atoi(arg);
+ g_bLogMessages = parse_toggle_state(cmd, arg);
break;
/* *************************************************************************
* show-on-task-bar (0|1)
* *************************************************************************/
case hash_show_on_task_bar :
- g_bShowOnTaskBar = atoi(arg);
+ g_bShowOnTaskBar = parse_toggle_state(cmd, arg);
break;
#endif /* defined(_WIN32) && ! defined(_WIN_CONSOLE) */