X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=54151bda98b4ff361a7bb9186949979222428d68;hp=f65cd8ab20264d5fb7a5eee3586e145590166534;hb=5f1bd5c145ac9cf6e01821b315802639d668a1d5;hpb=a50060ea14e1667eb6654d02de387d5ee8b0bd0f

diff --git a/config b/config
index f65cd8ab..54151bda 100644
--- a/config
+++ b/config
@@ -1,8 +1,8 @@
-#    Sample Configuration File for Privoxy v3.0.16
+#        Sample Configuration File for Privoxy v3.0.16
 #
-#  $Id: config,v 1.84 2009/12/15 17:43:37 fabiankeil Exp $
+#  $Id: config,v 1.88 2010/02/13 16:43:35 fabiankeil Exp $
 #
-#  Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/
+#  Copyright (C) 2001-2010 Privoxy Developers http://www.privoxy.org/
 #
 ####################################################################
 #                                                                  #
@@ -1318,6 +1318,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 +1485,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 +1715,7 @@ socket-timeout 300
 #      max-client-connections 256
 #
 #max-client-connections 256
-
+#
 #
 #  6.9. handle-as-empty-doc-returns-ok
 #  ====================================
@@ -1732,8 +1749,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
 #  =======================