projects
/
privoxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
31eb721
)
If connection-sharing is enabled but keep-alive-timeout isn't, log a warning and...
author
Fabian Keil
<fk@fabiankeil.de>
Sun, 19 Jul 2009 10:07:46 +0000
(10:07 +0000)
committer
Fabian Keil
<fk@fabiankeil.de>
Sun, 19 Jul 2009 10:07:46 +0000
(10:07 +0000)
loadcfg.c
patch
|
blob
|
history
diff --git
a/loadcfg.c
b/loadcfg.c
index
94cf087
..
62b943d
100644
(file)
--- a/
loadcfg.c
+++ b/
loadcfg.c
@@
-1,4
+1,4
@@
-const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.10
2 2009/05/16 13:27:20
fabiankeil Exp $";
+const char loadcfg_rcs[] = "$Id: loadcfg.c,v 1.10
3 2009/06/15 20:50:56
fabiankeil Exp $";
/*********************************************************************
*
* File : $Source: /cvsroot/ijbswa/current/loadcfg.c,v $
/*********************************************************************
*
* 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.");
}
}
"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)
#endif
if (NULL == config->proxy_args)