From: Fabian Keil Date: Tue, 5 Feb 2013 14:08:37 +0000 (+0000) Subject: Regenerate config X-Git-Tag: v_3_0_21~64 X-Git-Url: http://www.privoxy.org/gitweb/team/%22/11member_t.jpg?a=commitdiff_plain;h=cebe5dbd38312ffeb2f22b7de523f56f1aac7718;p=privoxy.git Regenerate config --- diff --git a/config b/config index 2e3dee59..8943ecf4 100644 --- a/config +++ b/config @@ -1,6 +1,6 @@ # Sample Configuration File for Privoxy v3.0.20 # -# $Id: config,v 1.100 2013/01/09 15:07:39 fabiankeil Exp $ +# $Id: config,v 1.101 2013/01/09 15:19:47 fabiankeil Exp $ # # Copyright (C) 2001-2013 Privoxy Developers http://www.privoxy.org/ # @@ -68,7 +68,6 @@ # last character. # # -# # 1. LOCAL SET-UP DOCUMENTATION # ============================== # @@ -77,7 +76,6 @@ # you, what you block and why you do that, your policies, etc. # # -# # 1.1. user-manual # ================= # @@ -131,7 +129,6 @@ # #user-manual http://www.privoxy.org/user-manual/ # -# # 1.2. trust-info-url # ==================== # @@ -168,7 +165,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 +193,6 @@ # #admin-address privoxy-admin@example.com # -# # 1.4. proxy-info-url # ==================== # @@ -229,7 +224,6 @@ # #proxy-info-url http://www.example.com/proxy-service.html # -# # 2. CONFIGURATION AND LOG FILE LOCATIONS # ======================================== # @@ -242,7 +236,6 @@ # be modified, such as log files and actions files. # # -# # 2.1. confdir # ============= # @@ -268,7 +261,6 @@ # confdir . # -# # 2.2. templdir # ============== # @@ -298,7 +290,6 @@ confdir . # #templdir . # -# # 2.3. logdir # ============ # @@ -325,7 +316,6 @@ confdir . # logdir . # -# # 2.4. actionsfile # ================= # @@ -372,7 +362,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 +407,6 @@ actionsfile user.action # User customizations filterfile default.filter filterfile user.filter # User customizations # -# # 2.6. logfile # ============= # @@ -465,7 +453,6 @@ filterfile user.filter # User customizations # logfile logfile # -# # 2.7. trustfile # =============== # @@ -522,7 +509,6 @@ logfile logfile # #trustfile trust # -# # 3. DEBUGGING # ============= # @@ -531,7 +517,6 @@ logfile logfile # line option when debugging. # # -# # 3.1. debug # =========== # @@ -607,7 +592,6 @@ logfile logfile #debug 4096 # Startup banner and warnings #debug 8192 # Non-fatal errors # -# # 3.2. single-threaded # ===================== # @@ -635,7 +619,6 @@ logfile logfile # #single-threaded # -# # 3.3. hostname # ============== # @@ -671,7 +654,6 @@ logfile logfile # #hostname hostname.example.org # -# # 4. ACCESS CONTROL AND SECURITY # =============================== # @@ -679,7 +661,6 @@ logfile logfile # aspects of Privoxy's configuration. # # -# # 4.1. listen-address # ==================== # @@ -778,7 +759,6 @@ logfile logfile # listen-address 127.0.0.1:8118 # -# # 4.2. toggle # ============ # @@ -807,7 +787,6 @@ listen-address 127.0.0.1:8118 # toggle 1 # -# # 4.3. enable-remote-toggle # ========================== # @@ -850,7 +829,6 @@ toggle 1 # enable-remote-toggle 0 # -# # 4.4. enable-remote-http-toggle # =============================== # @@ -889,7 +867,6 @@ enable-remote-toggle 0 # enable-remote-http-toggle 0 # -# # 4.5. enable-edit-actions # ========================= # @@ -930,7 +907,6 @@ enable-remote-http-toggle 0 # enable-edit-actions 0 # -# # 4.6. enforce-blocks # ==================== # @@ -979,7 +955,6 @@ enable-edit-actions 0 # enforce-blocks 0 # -# # 4.7. ACLs: permit-access and deny-access # ========================================= # @@ -1091,7 +1066,6 @@ enforce-blocks 0 # permit-access [::ffff:192.0.2.0]/120 # # -# # 4.8. buffer-limit # ================== # @@ -1129,7 +1103,6 @@ enforce-blocks 0 # buffer-limit 4096 # -# # 5. FORWARDING # ============== # @@ -1153,7 +1126,6 @@ buffer-limit 4096 # 4 and SOCKS 4A protocols. # # -# # 5.1. forward # ============= # @@ -1221,7 +1193,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 +1293,6 @@ buffer-limit 4096 # forward localhost/ . # # -# # 5.3. forwarded-connect-retries # =============================== # @@ -1371,11 +1341,9 @@ buffer-limit 4096 # forwarded-connect-retries 0 # -# # 6. MISCELLANEOUS # ================= # -# # 6.1. accept-intercepted-requests # ================================= # @@ -1414,7 +1382,6 @@ forwarded-connect-retries 0 # accept-intercepted-requests 0 # -# # 6.2. allow-cgi-request-crunching # ================================= # @@ -1452,7 +1419,6 @@ accept-intercepted-requests 0 # allow-cgi-request-crunching 0 # -# # 6.3. split-large-forms # ======================= # @@ -1495,7 +1461,6 @@ allow-cgi-request-crunching 0 # split-large-forms 0 # -# # 6.4. keep-alive-timeout # ======================== # @@ -1552,7 +1517,6 @@ split-large-forms 0 # keep-alive-timeout 5 # -# # 6.5. tolerate-pipelining # ========================= # @@ -1596,7 +1560,6 @@ keep-alive-timeout 5 # tolerate-pipelining 1 # -# # 6.6. default-server-timeout # ============================ # @@ -1648,7 +1611,6 @@ tolerate-pipelining 1 # #default-server-timeout 60 # -# # 6.7. connection-sharing # ======================== # @@ -1719,7 +1681,6 @@ tolerate-pipelining 1 # #connection-sharing 1 # -# # 6.8. socket-timeout # ==================== # @@ -1752,7 +1713,6 @@ tolerate-pipelining 1 # socket-timeout 300 # -# # 6.9. max-client-connections # ============================ # @@ -1808,7 +1768,8 @@ socket-timeout 300 # #max-client-connections 256 # -# 1.6.10. handle-as-empty-doc-returns-ok +# 6.10. handle-as-empty-doc-returns-ok +# ===================================== # # Specifies: # @@ -1845,7 +1806,8 @@ socket-timeout 300 # #handle-as-empty-doc-returns-ok 1 # -# 1.6.11. enable-compression +# 6.11. enable-compression +# ========================= # # Specifies: # @@ -1885,7 +1847,8 @@ socket-timeout 300 # #enable-compression 1 # -# 1.6.12. compression-level +# 6.12. compression-level +# ======================== # # Specifies: # @@ -1930,7 +1893,8 @@ socket-timeout 300 # #compression-level 1 # -# 1.6.13. client-header-order +# 6.13. client-header-order +# ========================== # # Specifies: # @@ -1970,13 +1934,13 @@ socket-timeout 300 # Proxy-Connection \ # Referer \ # Cookie \ +# DNT \ # If-Modified-Since \ # Cache-Control \ # Content-Length \ # Content-Type # # -# # 7. WINDOWS GUI OPTIONS # ======================= #