From e6fba62fd97029e86c0851d3775881817953fd71 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 19 Jul 2009 10:07:46 +0000 Subject: [PATCH] If connection-sharing is enabled but keep-alive-timeout isn't, log a warning and disable it. --- loadcfg.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/loadcfg.c b/loadcfg.c index 94cf087f..62b943df 100644 --- a/loadcfg.c +++ b/loadcfg.c @@ -1,4 +1,4 @@ -const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.102 2009/05/16 13:27:20 fabiankeil Exp $"; +const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.103 2009/06/15 20:50:56 fabiankeil Exp $"; /********************************************************************* * * File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $ @@ -1343,6 +1343,12 @@ struct configuration_spec * load_config(void) "Config option single-threaded disables connection keep-alive."); } } + else if ((config->feature_flags & RUNTIME_FEATURE_CONNECTION_SHARING)) + { + log_error(LOG_LEVEL_ERROR, "Config option connection-sharing " + "has no effect if keep-alive-timeout isn't set."); + config->feature_flags &= ~RUNTIME_FEATURE_CONNECTION_SHARING; + } #endif if (NULL == config->proxy_args) -- 2.39.2