-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.83 2008/12/20 14:53:55 fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.84 2009/01/14 16:14:36 fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
*
* Revisions :
* $Log: loadcfg.c,v $
+ * 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
fclose(configfp);
set_debug_level(config->debug);
-#ifdef FEATURE_CONNECTION_KEEP_ALIVE
- set_keep_alive_timeout(keep_alive_timeout);
-#endif
freez(config->logfile);
}
}
+#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");