don't leave firefox hanging by default

[privoxy.git] / config

diff --git a/config b/config
index 38eb50a..ad966ed 100644 (file)
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-#    Sample Configuration File for Privoxy v3.0.15 beta
+#    Sample Configuration File for Privoxy v3.0.16
 #
-#  $Id: config,v 1.81 2009/07/18 16:06:33 fabiankeil Exp $
+#  $Id: config,v 1.85 2010/01/11 13:46:38 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:
@@ -1563,7 +1611,7 @@ keep-alive-timeout 300
 #connection-sharing 1
 #
 #
-#  6.6. socket-timeout
+#  6.7. socket-timeout
 #  ====================
 #
 #  Specifies:
@@ -1596,7 +1644,7 @@ keep-alive-timeout 300
 socket-timeout 300
 #
 #
-#  6.7. max-client-connections
+#  6.8. max-client-connections
 #  ============================
 #
 #  Specifies:
@@ -1650,7 +1698,42 @@ socket-timeout 300
 #      max-client-connections 256
 #
 #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
 #  =======================