X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=loadcfg.c;h=eac9206a811378fa46625baf9a3636ee8aac8d44;hp=cf6fa9e11e6c0622c3e6eca0dfc37075383f798a;hb=e95f1a6305beb048c90caf15ad8045f9811089ab;hpb=1229c1bd3d1494ed3eb583f64c46a7b19e3cce19 diff --git a/loadcfg.c b/loadcfg.c index cf6fa9e1..eac9206a 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,3 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.164 2017/06/26 12:11:13 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -101,8 +100,6 @@ const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.164 2017/06/26 12:11:13 fabiankei */ #define DEFAULT_LISTEN_BACKLOG 128 -const char loadcfg_h_rcs[] = LOADCFG_H_VERSION; - #ifdef FEATURE_TOGGLE /* Privoxy is enabled by default. */ int global_toggle_state = 1; @@ -1443,7 +1440,7 @@ struct configuration_spec * load_config(void) * On platforms were we use poll() we don't have to enforce * an upper connection limit either. * - * XXX: Do OS/2, Amiga etc. belong here as well? + * XXX: Do OS/2 etc. belong here as well? */ if (max_client_connections < 1) { @@ -1990,9 +1987,11 @@ struct configuration_spec * load_config(void) /* FIXME: end kludge */ - config->need_bind = 1; - - if (current_configfile) + if (current_configfile == NULL) + { + config->need_bind = 1; + } + else { struct configuration_spec * oldcfg = (struct configuration_spec *) current_configfile->f;