projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Skip a regex if we don't need the captured result
[privoxy.git]
/
loadcfg.c
diff --git
a/loadcfg.c
b/loadcfg.c
index
9ffd509
..
39e1828
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.1
59 2017/05/25 11:17:38
fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.1
61 2017/06/04 14:42:13
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
@@
-90,6
+90,12
@@
const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.159 2017/05/25 11:17:38 fabiankei
#include "client-tags.h"
#endif
#include "client-tags.h"
#endif
+/*
+ * Default number of seconds after which an
+ * open connection will no longer be reused.
+ */
+#define DEFAULT_KEEP_ALIVE_TIMEOUT 180
+
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#ifdef FEATURE_TOGGLE
const char loadcfg_h_rcs[] = LOADCFG_H_VERSION;
#ifdef FEATURE_TOGGLE
@@
-1836,11
+1842,7
@@
struct configuration_spec * load_config(void)
#ifdef FEATURE_CONNECTION_SHARING
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{
#ifdef FEATURE_CONNECTION_SHARING
if (config->feature_flags & RUNTIME_FEATURE_CONNECTION_KEEP_ALIVE)
{
- if (config->multi_threaded)
- {
- set_keep_alive_timeout(config->keep_alive_timeout);
- }
- else
+ if (!config->multi_threaded)
{
/*
* While we could use keep-alive without multiple threads
{
/*
* While we could use keep-alive without multiple threads