X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=config;h=a2d564eca5cc8e10e32302533cf37f7813a846c4;hp=33691aba1616fb74a9fca543e3919c668f906083;hb=42a63263b2fec9d1cb5118ec1d5b0f799f08b45c;hpb=431ce37bfc83ccd5d5e0f1ebc871a6bc8738d9c9 diff --git a/config b/config index 33691aba..a2d564ec 100644 --- a/config +++ b/config @@ -1,8 +1,8 @@ -# Sample Configuration File for Privoxy v3.0.11 +# Sample Configuration File for Privoxy v3.0.12 # -# $Id: p-config.sgml,v 2.32 2008/08/30 12:03:09 fabiankeil Exp $ +# $Id: config,v 1.74 2009/02/19 17:26:26 fabiankeil Exp $ # -# Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ +# Copyright (C) 2001-2009 Privoxy Developers http://www.privoxy.org/ # #################################################################### # # @@ -130,7 +130,7 @@ # If set, this option should be the first option in the config # file, because it is used while the config file is being read. # -#user-manual http://www.privoxy.org/user-manual/ +user-manual /home/halb/privoxy/share/doc/privoxy/user-manual/ # # # 1.2. trust-info-url @@ -147,7 +147,7 @@ # # Default value: # -# Two example URLs are provided +# Unset # # Effect if unset: # @@ -166,8 +166,8 @@ # don't end up locked out from the information on why they were # locked out in the first place! # -trust-info-url http://www.example.com/why_we_block.html -trust-info-url http://www.example.com/what_we_allow.html +#trust-info-url http://www.example.com/why_we_block.html +#trust-info-url http://www.example.com/what_we_allow.html # # # 1.3. admin-address @@ -267,7 +267,7 @@ trust-info-url http://www.example.com/what_we_allow.html # # No trailing "/", please. # -confdir . +confdir /home/halb/privoxy/etc # # # 2.2. templdir @@ -324,7 +324,7 @@ confdir . # # No trailing "/", please. # -logdir . +logdir /home/halb/privoxy/var/log/privoxy # # # 2.4. actionsfile @@ -340,11 +340,11 @@ logdir . # # Default values: # -# standard.action # Internal purposes, no editing recommended +# match-all.action # Actions that are applied to all sites and maybe overruled later on. # -# default.action # Main actions file +# default.action # Main actions file # -# user.action # User customizations +# user.action # User customizations # # Effect if unset: # @@ -355,10 +355,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 +369,7 @@ logdir . # was necessary to be consistent with the other file options and # to allow previously forbidden characters. # -actionsfile standard.action # Internal purpose, recommended +actionsfile match-all.action # Actions that are applied to all sites and maybe overruled later on. actionsfile default.action # Main actions file actionsfile user.action # User customizations # @@ -557,7 +556,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 @@ -567,7 +566,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 @@ -601,7 +600,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 # @@ -1386,6 +1386,86 @@ 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. +# +# Notes: +# +# Note that reusing connections doesn't necessary cause +# speedups. There are also a few privacy implications you should +# be aware of. +# +# Outgoing connections are shared between clients (if there are +# more than one) and closing the client that initiated the outgoing +# connection does not affect the connection between Privoxy and +# the server unless the client's request hasn't been completed +# yet. If the outgoing connection is idle, it will not be closed +# until either Privoxy's or the server's timeout is reached. While +# it's open, the server knows that the system running Privoxy is +# still there. +# +# Examples: +# +# keep-alive-timeout 300 +# +keep-alive-timeout 300 +# +# +# 5.8. socket-timeout +# ==================== +# +# Specifies: +# +# Number of seconds after which a socket times out if no data +# is received. +# +# Type of value: +# +# Time in seconds. +# +# Default value: +# +# None +# +# Effect if unset: +# +# A default value of 300 seconds is used. +# +# Notes: +# +# For SOCKS requests the timeout currently doesn't start until +# the SOCKS server accepted the request. This will be fixed in +# the next release. +# +# Examples: +# +# socket-timeout 300 +# +socket-timeout 300 +# +# # 6. WINDOWS GUI OPTIONS # ======================= #