X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=7dcb29673ca3996cfbd1d058e3d675df3beab11b;hp=945e8535c795d673a70829ba67f744e200c433f2;hb=52feb95cca9309b54829313054d8f4befabbd028;hpb=594da2fb0547a6325317ff12476f400622bb6cf5

diff --git a/config b/config
index 945e8535..7dcb2967 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-#        Sample Configuration File for Privoxy v3.0.13
+#    Sample Configuration File for Privoxy v3.0.16
 #
-#  $Id: config,v 1.78 2009/04/17 13:27:06 fabiankeil Exp $
+#  $Id: config,v 1.83 2009/11/29 15:04:51 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
 #
@@ -713,10 +713,7 @@ logfile logfile
 #      If you leave out the IP address, Privoxy will bind to all IPv4
 #      interfaces (addresses) on your machine and may become reachable
 #      from the Internet. In that case, consider using access control
-#      lists (ACL's, see below), and/or a firewall. If the hostname
-#      is localhost, Privoxy will explicitly try to bind to an IPv4
-#      address. For other hostnames it depends on the operating system
-#      which IP version will be used.
+#      lists (ACL's, see below), and/or a firewall.
 #
 #      If you open Privoxy to untrusted users, you will also
 #      want to make sure that the following actions are disabled:
@@ -1492,7 +1489,58 @@ split-large-forms 0
 keep-alive-timeout 300
 #
 #
-#  6.5. connection-sharing
+#  6.5. default-server-timeout
+#  ============================
+#
+#  Specifies:
+#
+#      Assumed server-side keep-alive timeout if not specified by
+#      the server.
+#
+#  Type of value:
+#
+#      Time in seconds.
+#
+#  Default value:
+#
+#      None
+#
+#  Effect if unset:
+#
+#      Connections for which the server didn't specify the keep-alive
+#      timeout are not reused.
+#
+#  Notes:
+#
+#      Enabling this option significantly increases the number of
+#      connections that are reused, provided the keep-alive-timeout
+#      option is also enabled.
+#
+#      While it also increases the number of connections problems when
+#      Privoxy tries to reuse a connection that already has been closed
+#      on the server side, or is closed while Privoxy is trying to
+#      reuse it, this should only be a problem if it happens for the
+#      first request sent by the client. If it happens for requests
+#      on reused client connections, Privoxy will simply close the
+#      connection and the client is supposed to retry the request
+#      without bothering the user.
+#
+#      Enabling this option is therefore only recommended if the
+#      connection-sharing option is disabled.
+#
+#      It is an error to specify a value larger than the
+#      keep-alive-timeout value.
+#
+#      This option has no effect if Privoxy has been compiled without
+#      keep-alive support.
+#
+#  Examples:
+#
+#      default-server-timeout 60
+#
+#default-server-timeout 60
+#
+#  6.6. connection-sharing
 #  ========================
 #
 #  Specifies:
@@ -1525,7 +1573,7 @@ keep-alive-timeout 300
 #
 #      If this option is effective, outgoing connections are shared
 #      between clients (if there are more than one) and closing the
-#      client that initiated the outgoing connection does no longer
+#      browser that initiated the outgoing connection does no longer
 #      affect the connection between Privoxy and the server unless
 #      the client's request hasn't been completed yet.
 #
@@ -1548,6 +1596,11 @@ keep-alive-timeout 300
 #      outgoing connections alive even if the client itself doesn't
 #      support it.
 #
+#      You should also be aware that enabling this option increases
+#      the likelihood of getting the "No server or forwarder data"
+#      error message, especially if you are using a slow connection
+#      to the Internet.
+#
 #      This option should only be used by experienced users who
 #      understand the risks and can weight them against the benefits.
 #
@@ -1558,7 +1611,7 @@ keep-alive-timeout 300
 #connection-sharing 1
 #
 #
-#  6.6. socket-timeout
+#  6.7. socket-timeout
 #  ====================
 #
 #  Specifies:
@@ -1591,7 +1644,7 @@ keep-alive-timeout 300
 socket-timeout 300
 #
 #
-#  6.7. max-client-connections
+#  6.8. max-client-connections
 #  ============================
 #
 #  Specifies: