X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=config;h=482a0729b54e8ee418aa998149beb66606f4a68c;hb=72b08384695864349e0f5f098d6901665e65ec4f;hp=ad966ed667915a39457289d65b38ac3f8874d54b;hpb=063c6997d7799260d30adb57e3563dc53f11e38f;p=privoxy.git

diff --git a/config b/config
index ad966ed6..482a0729 100644
--- 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.85 2010/01/11 13:46:38 fabiankeil Exp $
+#  $Id: config,v 1.91 2010/11/06 12:56:15 fabiankeil Exp $
 #
-#  Copyright (C) 2001-2009 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
-#filterfile user.filter      # User customizations
+filterfile user.filter      # User customizations
 #
 #
 #  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        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 +570,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
@@ -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.
 #
+#      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 +1486,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
@@ -1698,7 +1716,7 @@ socket-timeout 300
 #      max-client-connections 256
 #
 #max-client-connections 256
-
+#
 #
 #  6.9. handle-as-empty-doc-returns-ok
 #  ====================================
@@ -1733,7 +1751,7 @@ socket-timeout 300
 #      other blocked pages.
 #
 handle-as-empty-doc-returns-ok 1
-
+#
 #
 #  7. WINDOWS GUI OPTIONS
 #  =======================