#94: Add a config directive to let Privoxy prefer either IPv4 (or IPv6) addresses

[privoxy.git] / config

diff --git a/config b/config
index f65cd8a..429a67f 100644 (file)
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
-#    Sample Configuration File for Privoxy v3.0.16
+#        Sample Configuration File for Privoxy v3.0.17
 #
-#  $Id: config,v 1.84 2009/12/15 17:43:37 fabiankeil Exp $
+#  $Id: config,v 1.93 2010/11/13 12:48:18 fabiankeil Exp $
 #
-#  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
+#  Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
 #
 ####################################################################
 #                                                                  #
@@ -113,7 +113,6 @@
 #
 #        user-manual  /usr/share/doc/privoxy/user-manual
 #
-#
 #      The User Manual is then available to anyone with
 #      access to Privoxy, by following the built-in URL:
 #      http://config.privoxy.org/user-manual/ (or the shortcut:
@@ -124,7 +123,6 @@
 #
 #        user-manual  http://example.com/privoxy/user-manual/
 #
-#
 #      WARNING!!!
 #
 #          If set, this option should be the first option in the config
@@ -416,7 +414,7 @@ actionsfile user.action      # User customizations
 #      separate file, such as user.filter.
 #
 filterfile default.filter
-#filterfile user.filter      # User customizations
+filterfile user.filter      # User customizations
 #
 #
 #  2.6. logfile
@@ -560,7 +558,7 @@ logfile logfile
 #        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
@@ -570,6 +568,7 @@ logfile logfile
 #        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
@@ -728,13 +727,11 @@ logfile logfile
 #
 #        listen-address  192.168.0.1:8118
 #
-#
 #      Suppose you are running Privoxy on an IPv6-capable machine and
 #      you want it to listen on the IPv6 address of the loopback device:
 #
 #        listen-address [::1]:8118
 #
-#
 listen-address  127.0.0.1:8118
 #
 #
@@ -1007,10 +1004,10 @@ enforce-blocks 0
 #      names. If a DNS name resolves to multiple IP addresses, only
 #      the first one is used.
 #
-#      Some systems allows IPv4 client to connect to IPv6 server
-#      socket. Then the client's IPv4 address will be translated by
+#      Some systems allow IPv4 clients to connect to IPv6 server
+#      sockets. Then the client's IPv4 address will be translated by the
 #      system into IPv6 address space with special prefix ::ffff:0:0/96
-#      (so called IPv4 mapped IPv6 address).  Privoxy can handle it
+#      (so called IPv4 mapped IPv6 address). Privoxy can handle it
 #      and maps such ACL addresses automatically.
 #
 #      Denying access to particular sites by ACL may have undesired
@@ -1170,7 +1167,7 @@ buffer-limit 4096
 #
 #      Parent proxy specified by an IPv6 address:
 #
-#        foward   /                   [2001:DB8::1]:8000
+#        forward   /                   [2001:DB8::1]:8000
 #
 #
 #      Suppose your parent proxy doesn't support IPv6:
@@ -1277,7 +1274,6 @@ buffer-limit 4096
 #
 #
 #
-#
 #  5.3. forwarded-connect-retries
 #  ===============================
 #
@@ -1318,6 +1314,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.
 #
+#      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
@@ -1482,11 +1481,25 @@ split-large-forms 0
 #      This option has no effect if Privoxy has been compiled without
 #      keep-alive support.
 #
+#      Note that a timeout of five seconds as used in the default
+#      configuration file significantly decreases the number of
+#      connections that will be reused.  The value is used because some
+#      browsers limit the number of connections they open to a single
+#      host and apply the same limit to proxies. This can result in a
+#      single website "grabbing" all the connections the browser allows,
+#      which means connections to other websites can't be opened until
+#      the connections currently in use time out.
+#
+#      Several users have reported this as a Privoxy bug, so the default
+#      value has been reduced. Consider increasing it to 300 seconds
+#      or even more if you think your browser can handle it. If your
+#      browser appears to be hanging it can't.
+#
 #  Examples:
 #
 #      keep-alive-timeout 300
 #
-keep-alive-timeout 300
+keep-alive-timeout 5
 #
 #
 #  6.5. default-server-timeout
@@ -1540,6 +1553,7 @@ keep-alive-timeout 300
 #
 #default-server-timeout 60
 #
+#
 #  6.6. connection-sharing
 #  ========================
 #
@@ -1698,7 +1712,7 @@ socket-timeout 300
 #      max-client-connections 256
 #
 #max-client-connections 256
-
+#
 #
 #  6.9. handle-as-empty-doc-returns-ok
 #  ====================================
@@ -1732,8 +1746,8 @@ socket-timeout 300
 #      +handle-as-empty-document and a status 403(Forbidden) for all
 #      other blocked pages.
 #
-#handle-as-empty-doc-returns-ok 0
-
+handle-as-empty-doc-returns-ok 1
+#
 #
 #  7. WINDOWS GUI OPTIONS
 #  =======================