X-Git-Url: http://www.privoxy.org/gitweb/new.html?a=blobdiff_plain;f=config;h=863ff6e51c1631d12e817a0587e327daf234012c;hb=f49b947014788cbbaecae6973d43229a70b6d366;hp=bee2e6d2a07d9617f21d2791ab321132204ff20d;hpb=fb96a1c13ac57c393e46a984ed5d006b7036a277;p=privoxy.git
diff --git a/config b/config
index bee2e6d2..863ff6e5 100644
--- a/config
+++ b/config
@@ -1,6 +1,6 @@
-# Sample Configuration File for Privoxy v3.0.20
+# Sample Configuration File for Privoxy 3.0.21
#
-# $Id: config,v 1.99 2013/01/09 15:07:21 fabiankeil Exp $
+# $Id: config,v 1.103 2013/03/02 14:47:05 fabiankeil Exp $
#
# Copyright (C) 2001-2013 Privoxy Developers http://www.privoxy.org/
#
@@ -16,7 +16,8 @@
# 3. DEBUGGING #
# 4. ACCESS CONTROL AND SECURITY #
# 5. FORWARDING #
-# 6. WINDOWS GUI OPTIONS #
+# 6. MISCELLANEOUS #
+# 7. WINDOWS GUI OPTIONS #
# #
####################################################################
#
@@ -68,7 +69,6 @@
# last character.
#
#
-#
# 1. LOCAL SET-UP DOCUMENTATION
# ==============================
#
@@ -77,7 +77,6 @@
# you, what you block and why you do that, your policies, etc.
#
#
-#
# 1.1. user-manual
# =================
#
@@ -131,7 +130,6 @@
#
#user-manual http://www.privoxy.org/user-manual/
#
-#
# 1.2. trust-info-url
# ====================
#
@@ -168,7 +166,6 @@
#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
# ===================
#
@@ -197,7 +194,6 @@
#
#admin-address privoxy-admin@example.com
#
-#
# 1.4. proxy-info-url
# ====================
#
@@ -229,7 +225,6 @@
#
#proxy-info-url http://www.example.com/proxy-service.html
#
-#
# 2. CONFIGURATION AND LOG FILE LOCATIONS
# ========================================
#
@@ -242,7 +237,6 @@
# be modified, such as log files and actions files.
#
#
-#
# 2.1. confdir
# =============
#
@@ -268,7 +262,6 @@
#
confdir .
#
-#
# 2.2. templdir
# ==============
#
@@ -298,7 +291,6 @@ confdir .
#
#templdir .
#
-#
# 2.3. logdir
# ============
#
@@ -325,7 +317,6 @@ confdir .
#
logdir .
#
-#
# 2.4. actionsfile
# =================
#
@@ -372,7 +363,6 @@ actionsfile match-all.action # Actions that are applied to all sites and maybe o
actionsfile default.action # Main actions file
actionsfile user.action # User customizations
#
-#
# 2.5. filterfile
# ================
#
@@ -418,7 +408,6 @@ actionsfile user.action # User customizations
filterfile default.filter
filterfile user.filter # User customizations
#
-#
# 2.6. logfile
# =============
#
@@ -465,7 +454,6 @@ filterfile user.filter # User customizations
#
logfile logfile
#
-#
# 2.7. trustfile
# ===============
#
@@ -522,7 +510,6 @@ logfile logfile
#
#trustfile trust
#
-#
# 3. DEBUGGING
# =============
#
@@ -531,7 +518,6 @@ logfile logfile
# line option when debugging.
#
#
-#
# 3.1. debug
# ===========
#
@@ -607,7 +593,6 @@ logfile logfile
#debug 4096 # Startup banner and warnings
#debug 8192 # Non-fatal errors
#
-#
# 3.2. single-threaded
# =====================
#
@@ -635,7 +620,6 @@ logfile logfile
#
#single-threaded
#
-#
# 3.3. hostname
# ==============
#
@@ -671,7 +655,6 @@ logfile logfile
#
#hostname hostname.example.org
#
-#
# 4. ACCESS CONTROL AND SECURITY
# ===============================
#
@@ -679,7 +662,6 @@ logfile logfile
# aspects of Privoxy's configuration.
#
#
-#
# 4.1. listen-address
# ====================
#
@@ -778,7 +760,6 @@ logfile logfile
#
listen-address 127.0.0.1:8118
#
-#
# 4.2. toggle
# ============
#
@@ -807,7 +788,6 @@ listen-address 127.0.0.1:8118
#
toggle 1
#
-#
# 4.3. enable-remote-toggle
# ==========================
#
@@ -850,7 +830,6 @@ toggle 1
#
enable-remote-toggle 0
#
-#
# 4.4. enable-remote-http-toggle
# ===============================
#
@@ -889,7 +868,6 @@ enable-remote-toggle 0
#
enable-remote-http-toggle 0
#
-#
# 4.5. enable-edit-actions
# =========================
#
@@ -930,7 +908,6 @@ enable-remote-http-toggle 0
#
enable-edit-actions 0
#
-#
# 4.6. enforce-blocks
# ====================
#
@@ -979,7 +956,6 @@ enable-edit-actions 0
#
enforce-blocks 0
#
-#
# 4.7. ACLs: permit-access and deny-access
# =========================================
#
@@ -1091,7 +1067,6 @@ enforce-blocks 0
# permit-access [::ffff:192.0.2.0]/120
#
#
-#
# 4.8. buffer-limit
# ==================
#
@@ -1129,6 +1104,46 @@ enforce-blocks 0
#
buffer-limit 4096
#
+# 4.9. enable-proxy-authentication-forwarding
+# ============================================
+#
+# Specifies:
+#
+# Whether or not proxy authentication through Privoxy should
+# work.
+#
+# Type of value:
+#
+# 0 or 1
+#
+# Default value:
+#
+# 0
+#
+# Effect if unset:
+#
+# Proxy authentication headers are removed.
+#
+# Notes:
+#
+# Privoxy itself does not support proxy authentication, but can
+# allow clients to authenticate against Privoxy's parent proxy.
+#
+# By default Privoxy (3.0.21 and later) don't do that and remove
+# Proxy-Authorization headers in requests and Proxy-Authenticate
+# headers in responses to make it harder for malicious sites to
+# trick inexperienced users into providing login information.
+#
+# If this option is enabled the headers are forwarded.
+#
+# Enabling this option is not recommended if there is no parent
+# proxy that requires authentication or if the local network
+# between Privoxy and the parent proxy isn't trustworthy. If
+# proxy authentication is only required for some requests, it is
+# recommended to use a client header filter to remove the
+# authentication headers for requests where they aren't needed.
+#
+enable-proxy-authentication-forwarding 0
#
# 5. FORWARDING
# ==============
@@ -1153,7 +1168,6 @@ buffer-limit 4096
# 4 and SOCKS 4A protocols.
#
#
-#
# 5.1. forward
# =============
#
@@ -1221,7 +1235,6 @@ buffer-limit 4096
# forward <[2-3][0-9a-f][0-9a-f][0-9a-f]:*> .
#
#
-#
# 5.2. forward-socks4, forward-socks4a, forward-socks5 and forward-socks5t
# =========================================================================
#
@@ -1322,7 +1335,6 @@ buffer-limit 4096
# forward localhost/ .
#
#
-#
# 5.3. forwarded-connect-retries
# ===============================
#
@@ -1371,11 +1383,9 @@ buffer-limit 4096
#
forwarded-connect-retries 0
#
-#
# 6. MISCELLANEOUS
# =================
#
-#
# 6.1. accept-intercepted-requests
# =================================
#
@@ -1414,7 +1424,6 @@ forwarded-connect-retries 0
#
accept-intercepted-requests 0
#
-#
# 6.2. allow-cgi-request-crunching
# =================================
#
@@ -1452,7 +1461,6 @@ accept-intercepted-requests 0
#
allow-cgi-request-crunching 0
#
-#
# 6.3. split-large-forms
# =======================
#
@@ -1495,7 +1503,6 @@ allow-cgi-request-crunching 0
#
split-large-forms 0
#
-#
# 6.4. keep-alive-timeout
# ========================
#
@@ -1552,7 +1559,6 @@ split-large-forms 0
#
keep-alive-timeout 5
#
-#
# 6.5. tolerate-pipelining
# =========================
#
@@ -1596,7 +1602,6 @@ keep-alive-timeout 5
#
tolerate-pipelining 1
#
-#
# 6.6. default-server-timeout
# ============================
#
@@ -1648,7 +1653,6 @@ tolerate-pipelining 1
#
#default-server-timeout 60
#
-#
# 6.7. connection-sharing
# ========================
#
@@ -1719,7 +1723,6 @@ tolerate-pipelining 1
#
#connection-sharing 1
#
-#
# 6.8. socket-timeout
# ====================
#
@@ -1752,7 +1755,6 @@ tolerate-pipelining 1
#
socket-timeout 300
#
-#
# 6.9. max-client-connections
# ============================
#
@@ -1766,7 +1768,7 @@ socket-timeout 300
#
# Default value:
#
-# None
+# 128
#
# Effect if unset:
#
@@ -1802,13 +1804,21 @@ socket-timeout 300
# Obviously using this option only makes sense if you choose a
# limit below the one enforced by the operating system.
#
+# One most POSIX-compliant systems Privoxy can't properly deal
+# with more than FD_SETSIZE file descriptors at the same time
+# and has to reject connections if the limit is reached. This
+# will likely change in a future version, but currently this
+# limit can't be increased without recompiling Privoxy with a
+# different FD_SETSIZE limit.
+#
# Examples:
#
# max-client-connections 256
#
#max-client-connections 256
#
-# 1.6.10. handle-as-empty-doc-returns-ok
+# 6.10. handle-as-empty-doc-returns-ok
+# =====================================
#
# Specifies:
#
@@ -1845,7 +1855,8 @@ socket-timeout 300
#
#handle-as-empty-doc-returns-ok 1
#
-# 1.6.11. enable-compression
+# 6.11. enable-compression
+# =========================
#
# Specifies:
#
@@ -1885,7 +1896,8 @@ socket-timeout 300
#
#enable-compression 1
#
-# 1.6.12. compression-level
+# 6.12. compression-level
+# ========================
#
# Specifies:
#
@@ -1930,7 +1942,8 @@ socket-timeout 300
#
#compression-level 1
#
-# 1.6.13. client-header-order
+# 6.13. client-header-order
+# ==========================
#
# Specifies:
#
@@ -1967,15 +1980,16 @@ socket-timeout 300
# Accept \
# Accept-Language \
# Accept-Encoding \
-# Proxy-Connection,\
-# Referer,Cookie \
+# Proxy-Connection \
+# Referer \
+# Cookie \
+# DNT \
# If-Modified-Since \
# Cache-Control \
# Content-Length \
# Content-Type
#
#
-#
# 7. WINDOWS GUI OPTIONS
# =======================
#