From 0a270e02b4f0dafab5cb075616db21e9b3f7a126 Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Fri, 23 May 2008 17:53:37 +0000 Subject: [PATCH] Sync with p-config.sgml 2.30. --- config | 115 ++++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 77 insertions(+), 38 deletions(-) diff --git a/config b/config index 257ee19f..32e51573 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ -# Sample Configuration File for Privoxy v3.0.8 +# Sample Configuration File for Privoxy v3.0.9 # -# $Id: config,v 1.62 2007/12/09 07:51:46 fabiankeil Exp $ +# $Id: p-config.sgml,v 2.30 2008/03/27 18:31:20 fabiankeil Exp $ # # Copyright (C) 2001-2008 Privoxy Developers http://www.privoxy.org/ # @@ -437,12 +437,13 @@ filterfile default.filter # an ad you think it should block) and it can help you to monitor # what your browser is doing. # -# Depending on the debug options below, the logfile may be a privacy -# risk if third parties can get access to it. As most users will never -# look at it, Privoxy 3.0.7 and later only log fatal errors by default. +# Depending on the debug options below, the logfile may be a +# privacy risk if third parties can get access to it. As most +# users will never look at it, Privoxy 3.0.7 and later only log +# fatal errors by default. # -# For most troubleshooting purposes, you will have to change that, please -# refer to the debugging section for details. +# For most troubleshooting purposes, you will have to change that, +# please refer to the debugging section for details. # # Your logfile will grow indefinitely, and you will probably # want to periodically remove it. On Unix systems, you can do @@ -563,7 +564,7 @@ logfile logfile # # Default value: # -# 0 (i.e.: only fatal errors (that cause Privoxy to exit) are logged) +# 0 (i.e.: only fatal errors (that cause Privoxy to exit) are logged) # # Effect if unset: # @@ -574,18 +575,18 @@ logfile logfile # The available debug levels are: # # debug 1 # log each request destination (and the crunch reason if Privoxy intercepted the request) -# debug 2 # show each connection status -# debug 4 # show I/O status -# debug 8 # show header parsing -# debug 16 # log all data written to the network into the logfile -# debug 32 # debug force feature -# debug 64 # debug regular expression filters -# debug 128 # debug redirects -# debug 256 # debug GIF de-animation -# debug 512 # Common Log Format -# debug 1024 # debug kill pop-ups -# debug 2048 # CGI user interface -# debug 4096 # Startup banner and warnings. +# debug 2 # show each connection status +# debug 4 # show I/O status +# debug 8 # show header parsing +# debug 16 # log all data written to the network into the logfile +# debug 32 # debug force feature +# debug 64 # debug regular expression filters +# debug 128 # debug redirects +# debug 256 # debug GIF de-animation +# debug 512 # Common Log Format +# debug 1024 # Unused +# debug 2048 # CGI user interface +# debug 4096 # Startup banner and warnings. # debug 8192 # Non-fatal errors # # @@ -593,30 +594,31 @@ logfile logfile # use multiple debug lines. # # A debug level of 1 is informative because it will show you each -# request as it happens. 1, 4096 and 8192 are recommended so that you -# will notice when things go wrong. The other levels are probably only -# of interest if you are hunting down a specific problem. They can -# produce a hell of an output (especially 16). -# -# Privoxy used to ship with the debug levels recommended above enabled -# by default, but due to privacy concerns 3.0.7 and later are -# configured to only log fatal errors. -# -# If you are used to the more verbose settings, simply enable the debug -# lines below again. +# request as it happens. 1, 4096 and 8192 are recommended so that +# you will notice when things go wrong. The other levels are +# probably only of interest if you are hunting down a specific +# problem. They can produce a hell of an output (especially 16). +# +# Privoxy used to ship with the debug levels recommended above +# enabled by default, but due to privacy concerns 3.0.7 and later +# are configured to only log fatal errors. +# +# If you are used to the more verbose settings, simply enable +# the debug lines below again. # # If you want to use pure CLF (Common Log Format), you should set -# debug 512 ONLY and not enable anything else. +# "debug 512" ONLY and not enable anything else. # # Privoxy has a hard-coded limit for the length of log messages. If # it's reached, messages are logged truncated and marked with # "... [too long, truncated]". # -# Please don't file any support requests without trying to reproduce -# the problem with increased debug level first. Once you read the log -# messages, you may even be able to solve the problem on your own. +# Please don't file any support requests without trying to +# reproduce the problem with increased debug level first. Once +# 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 each request destination (and the crunch reason if Privoxy intercepted the request) #debug 4096 # Startup banner and warnings #debug 8192 # Non-fatal errors # @@ -648,6 +650,40 @@ logfile logfile #single-threaded # # +# 3.3. hostname +# +# Specifies: +# +# The hostname shown on the CGI pages. +# +# Type of value: +# +# Text +# +# Default value: +# +# Unset +# +# Effect if unset: +# +# The hostname provided by the operating system is used. +# +# Notes: +# +# On some misconfigured systems resolving the hostname fails or +# takes too much time and slows Privoxy down. Setting a fixed +# hostname works around the problem. +# +# In other circumstances it might be desirable to show a hostname +# other than the one returned by the operating system. For example +# if the system has several different hostnames and you don't +# want to use the first one. +# +# Note that Privoxy does not validate the specified hostname value. +# +#hostname hostname.example.org +# +# # 4. ACCESS CONTROL AND SECURITY # # This section of the config file controls the security-relevant @@ -1097,7 +1133,7 @@ buffer-limit 4096 # # # -# 5.2. forward-socks4 and forward-socks4a +# 5.2. forward-socks4, forward-socks4a and forward-socks5 # # Specifies: # @@ -1113,7 +1149,7 @@ buffer-limit 4096 # denote "all URLs". http_parent and socks_proxy are IP addresses # in dotted decimal notation or valid DNS names (http_parent may # be "." to denote "no HTTP forwarding"), and the optional port -# parameters are TCP ports, i.e. integer values from 1 to 64535 +# parameters are TCP ports, i.e. integer values from 1 to 65535 # # Default value: # @@ -1133,6 +1169,9 @@ buffer-limit 4096 # target hostname happens on the SOCKS server, while in SOCKS 4 # it happens locally. # +# With forward-socks5 the DNS resolution will happen on the remote +# server as well. +# # If http_parent is ".", then requests are not forwarded to another # HTTP proxy but are made (HTTP-wise) directly to the web servers, # albeit through a SOCKS proxy. -- 2.39.2