projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move the match-all section into a separate file
[privoxy.git]
/
config
diff --git
a/config
b/config
index
f8e41ca
..
6ce0a51
100644
(file)
--- a/
config
+++ b/
config
@@
-1,8
+1,8
@@
# Sample Configuration File for Privoxy v3.0.11
#
# Sample Configuration File for Privoxy v3.0.11
#
-# $Id:
config,v 1.69 2008/12/14 15:46:22
fabiankeil Exp $
+# $Id:
p-config.sgml,v 2.36 2009/01/23 14:06:07
fabiankeil Exp $
#
#
-# Copyright (C) 2001-200
8
Privoxy Developers http://www.privoxy.org/
+# Copyright (C) 2001-200
9
Privoxy Developers http://www.privoxy.org/
#
####################################################################
# #
#
####################################################################
# #
@@
-340,9
+340,11
@@
logdir .
#
# Default values:
#
#
# Default values:
#
-#
default.action # Main actions file
+#
match-all.action # Actions that are applied to all sites and maybe overruled later on.
#
#
-# user.action # User customizations
+# default.action # Main actions file
+#
+# user.action # User customizations
#
# Effect if unset:
#
#
# Effect if unset:
#
@@
-367,6
+369,7
@@
logdir .
# was necessary to be consistent with the other file options and
# to allow previously forbidden characters.
#
# was necessary to be consistent with the other file options and
# to allow previously forbidden characters.
#
+actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on.
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
#
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
#
@@
-1415,6
+1418,33
@@
split-large-forms 0
keep-alive-timeout 300
#
#
keep-alive-timeout 300
#
#
+# 5.8. socket-timeout
+# ====================
+#
+# Specifies:
+#
+# Number of seconds after which a socket times out if no data
+# is received.
+#
+# Type of value:
+#
+# Time in seconds.
+#
+# Default value:
+#
+# None
+#
+# Effect if unset:
+#
+# A default value of 180 seconds is used.
+#
+# Examples:
+#
+# socket-timeout 180
+#
+socket-timeout 180
+#
+#
# 6. WINDOWS GUI OPTIONS
# =======================
#
# 6. WINDOWS GUI OPTIONS
# =======================
#