projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- Copy the release cycle description from announce.txt into
[privoxy.git]
/
config
diff --git
a/config
b/config
index
a4c168c
..
68dfd95
100644
(file)
--- a/
config
+++ b/
config
@@
-1,6
+1,6
@@
# Sample Configuration File for Privoxy v3.0.11
#
# Sample Configuration File for Privoxy v3.0.11
#
-# $Id: config,v 1.7
1 2009/02/08 18:35:48
fabiankeil Exp $
+# $Id: config,v 1.7
2 2009/02/09 16:49:47
fabiankeil Exp $
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
#
# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
#
@@
-1436,13
+1436,19
@@
keep-alive-timeout 300
#
# Effect if unset:
#
#
# Effect if unset:
#
-# A default value of 180 seconds is used.
+# A default value of 300 seconds is used.
+#
+# Notes:
+#
+# For SOCKS requests the timeout currently doesn't start until
+# the SOCKS server accepted the request. This will be fixed in
+# the next release.
#
# Examples:
#
#
# Examples:
#
-# socket-timeout
18
0
+# socket-timeout
30
0
#
#
-socket-timeout
18
0
+socket-timeout
30
0
#
#
# 6. WINDOWS GUI OPTIONS
#
#
# 6. WINDOWS GUI OPTIONS