X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=config;h=f8e41ca6cb4d7d4bd099957dbf8fe7f90fe76914;hb=d08efb68329798242aa848d30b50fc58254b1aaf;hp=24e84812d7d45bf56193c57dc8d3787a61cd0133;hpb=476af57f45625c29487c613180b69179ee874406;p=privoxy.git

diff --git a/config b/config
index 24e84812..f8e41ca6 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-#        Sample Configuration File for Privoxy v3.0.10
+#        Sample Configuration File for Privoxy v3.0.11
 #
-#  $Id: config,v 1.65 2008/06/13 15:41:42 fabiankeil Exp $
+#  $Id: config,v 1.69 2008/12/14 15:46:22 fabiankeil Exp $
 #
 #  Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/
 #
@@ -305,8 +305,8 @@ confdir .
 #
 #  Specifies:
 #
-#      The directory where all logging takes place (i.e. where logfile
-#      and jarfile are located).
+#      The directory where all logging takes place (i.e. where the
+#      logfile is located).
 #
 #  Type of value:
 #
@@ -340,8 +340,6 @@ logdir .
 #
 #  Default values:
 #
-#        standard.action     # Internal purposes, no editing recommended
-#
 #        default.action      # Main actions file
 #
 #        user.action         # User customizations
@@ -355,10 +353,9 @@ logdir .
 #      Multiple actionsfile lines are permitted, and are in fact
 #      recommended!
 #
-#      The default values include standard.action, which is used
-#      for internal purposes and should be loaded, default.action,
-#      which is the "main" actions file maintained by the developers,
-#      and user.action, where you can make your personal additions.
+#      The default values are default.action, which is the "main"
+#      actions file maintained by the developers, and user.action,
+#      where you can make your personal additions.
 #
 #      Actions files contain all the per site and per URL configuration
 #      for ad blocking, cookie management, privacy considerations,
@@ -370,7 +367,6 @@ logdir .
 #      was necessary to be consistent with the other file options and
 #      to allow previously forbidden characters.
 #
-actionsfile standard.action  # Internal purpose, recommended
 actionsfile default.action   # Main actions file
 actionsfile user.action      # User customizations
 #
@@ -468,40 +464,7 @@ filterfile default.filter
 logfile logfile
 #
 #
-#  2.7. jarfile
-#  =============
-#
-#  Specifies:
-#
-#      The file to store intercepted cookies in
-#
-#  Type of value:
-#
-#      File name, relative to logdir
-#
-#  Default value:
-#
-#      Unset (commented out). When activated: jarfile (Unix) or
-#      privoxy.jar (Windows).
-#
-#  Effect if unset:
-#
-#      Intercepted cookies are not stored in a dedicated log file.
-#
-#  Notes:
-#
-#      The jarfile may grow to ridiculous sizes over time.
-#
-#      If debug 8 (show header parsing) is enabled, cookies are also
-#      written to the logfile with the rest of the headers. Therefore
-#      this option isn't very useful and may be removed in future
-#      releases. Please report to the developers if you are still
-#      using it.
-#
-#jarfile jarfile
-#
-#
-#  2.8. trustfile
+#  2.7. trustfile
 #  ===============
 #
 #  Specifies:
@@ -590,7 +553,7 @@ logfile logfile
 #
 #      The available debug levels are:
 #
-#        debug         1 # log each request destination (and the crunch reason if Privoxy intercepted the request)
+#        debug         1 # Log the destination for each request Privoxy let through. See also debug 1024.
 #        debug         2 # show each connection status
 #        debug         4 # show I/O status
 #        debug         8 # show header parsing
@@ -600,7 +563,7 @@ logfile logfile
 #        debug       128 # debug redirects
 #        debug       256 # debug GIF de-animation
 #        debug       512 # Common Log Format
-#        debug      1024 # Unused
+#        debug      1024 # Log the destination for requests Privoxy didn't let through, and the reason why.
 #        debug      2048 # CGI user interface
 #        debug      4096 # Startup banner and warnings.
 #        debug      8192 # Non-fatal errors
@@ -634,7 +597,8 @@ logfile logfile
 #      you read the log messages, you may even be able to solve the
 #      problem on your own.
 #
-#debug      1 # log each request destination (and the crunch reason if Privoxy intercepted the request)
+#debug      1 # Log the destination for each request Privoxy let through.
+#debug   1024 # Log the destination for requests Privoxy didn't let through, and the reason why.
 #debug   4096 # Startup banner and warnings
 #debug   8192 # Non-fatal errors
 #
@@ -1419,6 +1383,38 @@ allow-cgi-request-crunching 0
 split-large-forms 0
 #
 #
+#  5.7. keep-alive-timeout
+#  ========================
+#
+#  Specifies:
+#
+#      Number of seconds after which an open connection will no longer
+#      be reused.
+#
+#  Type of value:
+#
+#      Time in seconds.
+#
+#  Default value:
+#
+#      None
+#
+#  Effect if unset:
+#
+#      Connections are not reused.
+#
+#  Notes:
+#
+#      This option has no effect if Privoxy has been compiled without
+#      keep-alive support.
+#
+#  Examples:
+#
+#      keep-alive-timeout 300
+#
+keep-alive-timeout 300
+#
+#
 #  6. WINDOWS GUI OPTIONS
 #  =======================
 #