projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Some formatting changes so changelog2doc.pl doesn't get digestion problems.
[privoxy.git]
/
config
diff --git
a/config
b/config
index
d772e11
..
482a072
100644
(file)
--- a/
config
+++ b/
config
@@
-1,6
+1,6
@@
-# Sample Configuration File for Privoxy v3.0.1
6
+# Sample Configuration File for Privoxy v3.0.1
7
#
#
-# $Id:
p-config.sgml,v 2.61 2010/02/04 09:35:04
fabiankeil Exp $
+# $Id:
config,v 1.91 2010/11/06 12:56:15
fabiankeil Exp $
#
# Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
#
#
# Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
#
@@
-416,7
+416,7
@@
actionsfile user.action # User customizations
# separate file, such as user.filter.
#
filterfile default.filter
# separate file, such as user.filter.
#
filterfile default.filter
-
#
filterfile user.filter # User customizations
+filterfile user.filter # User customizations
#
#
# 2.6. logfile
#
#
# 2.6. logfile
@@
-560,7
+560,7
@@
logfile logfile
# debug 2 # show each connection status
# debug 4 # show I/O status
# debug 8 # show header parsing
# debug 2 # show each connection status
# debug 4 # show I/O status
# debug 8 # show header parsing
-# debug 16 # log all data written to the network
into the logfile
+# debug 16 # log all data written to the network
# debug 32 # debug force feature
# debug 64 # debug regular expression filters
# debug 128 # debug redirects
# debug 32 # debug force feature
# debug 64 # debug regular expression filters
# debug 128 # debug redirects
@@
-570,6
+570,7
@@
logfile logfile
# debug 2048 # CGI user interface
# debug 4096 # Startup banner and warnings.
# debug 8192 # Non-fatal errors
# debug 2048 # CGI user interface
# debug 4096 # Startup banner and warnings.
# debug 8192 # Non-fatal errors
+# debug 32768 # log all data read from the network
#
#
# To select multiple debug levels, you can either add them or
#
#
# To select multiple debug levels, you can either add them or
@@
-1318,6
+1319,9
@@
buffer-limit 4096
# manually. Start with a small value and check Privoxy's logfile
# from time to time, to see how many retries are usually needed.
#
# manually. Start with a small value and check Privoxy's logfile
# from time to time, to see how many retries are usually needed.
#
+# Due to a bug, this option currently also causes Privoxy to
+# retry in case of certain problems with direct connections.
+#
# Examples:
#
# forwarded-connect-retries 1
# Examples:
#
# forwarded-connect-retries 1
@@
-1501,7
+1505,7
@@
split-large-forms 0
# keep-alive-timeout 300
#
keep-alive-timeout 5
# keep-alive-timeout 300
#
keep-alive-timeout 5
-
+#
#
# 6.5. default-server-timeout
# ============================
#
# 6.5. default-server-timeout
# ============================
@@
-1712,7
+1716,7
@@
socket-timeout 300
# max-client-connections 256
#
#max-client-connections 256
# max-client-connections 256
#
#max-client-connections 256
-
+#
#
# 6.9. handle-as-empty-doc-returns-ok
# ====================================
#
# 6.9. handle-as-empty-doc-returns-ok
# ====================================
@@
-1747,7
+1751,7
@@
socket-timeout 300
# other blocked pages.
#
handle-as-empty-doc-returns-ok 1
# other blocked pages.
#
handle-as-empty-doc-returns-ok 1
-
+#
#
# 7. WINDOWS GUI OPTIONS
# =======================
#
# 7. WINDOWS GUI OPTIONS
# =======================