X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=d2be8c390233f58debcd298470390efda76c15c8;hp=7dcb29673ca3996cfbd1d058e3d675df3beab11b;hb=74fec84a0663bc797225261a69859d835871873f;hpb=56d86bc6052f0ed6a027d54dfcb1e9d7db44627e

diff --git a/config b/config
index 7dcb2967..d2be8c39 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.83 2009/11/29 15:04:51 fabiankeil Exp $
+#  $Id: config,v 1.89 2010/02/15 16:47:12 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
@@ -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
@@ -1700,6 +1717,41 @@ socket-timeout 300
 #max-client-connections 256
 #
 #
+#  6.9. handle-as-empty-doc-returns-ok
+#  ====================================
+#
+#  Note:
+#
+#      This is a work-around for Firefox bug 492459: " Websites are no
+#      longer rendered if SSL requests for JavaScripts are blocked by
+#      a proxy. " (https:/ /bugzilla.mozilla.org/show_bug.cgi?id=492459)
+#
+#  Specifies:
+#
+#      The status code Privoxy returns for pages blocked with
+#      +handle-as-empty-document.
+#
+#  Type of value:
+#
+#      0 or 1
+#
+#  Default value:
+#
+#      0
+#
+#  Effect if unset:
+#
+#      Privoxy returns a status 403(forbidden) for all blocked pages.
+#
+#  Effect if set:
+#
+#      Privoxy returns a status 200(OK) for pages blocked with
+#      +handle-as-empty-document and a status 403(Forbidden) for all
+#      other blocked pages.
+#
+handle-as-empty-doc-returns-ok 1
+#
+#
 #  7. WINDOWS GUI OPTIONS
 #  =======================
 #