Make keep_alive_timeout static.

[privoxy.git] / default.action.master

diff --git a/default.action.master b/default.action.master
index 15eed2f..7536ccd 100644 (file)
--- a/default.action.master
+++ b/default.action.master
@@ -9,7 +9,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.143 2008/08/11 00:39:42 hal9 Exp $
+#  $Id: default.action.master,v 1.148 2008/09/21 11:36:59 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.9 or later due to 
 #                 syntax changes.
@@ -202,6 +202,11 @@
 #    Block this URL. Instead of forwarding the request, Privoxy will
 #    send a "block" page containing the specified reason.
 #
+# +change-x-forwarded-for{add}
+# +change-x-forwarded-for{block}
+#   Adds or blocks the "X-Forwarded-For:" HTTP header in client
+#   requests.
+#
 # +client-header-filter{name}
 #    All client headers to which this action applies are filtered on-the-fly
 #    through the specified regular expression based substitutions.
@@ -355,9 +360,6 @@
 #   servers. This can be used to prevent download menus for content you 
 #   prefer to view inside the browser, for example.
 #
-# +hide-forwarded-for-headers
-#   Block any existing X-Forwarded-for header.
-#
 # +hide-from-header{block}
 # +hide-from-header{spam@sittingduck.xqq}
 #   If the browser sends a "From:" header containing your e-mail address, 
@@ -500,7 +502,7 @@
 {{settings}}
 #############################################################################
 #MASTER# COMMENT: The minimum Privoxy version:
-for-privoxy-version=3.0.9
+for-privoxy-version=3.0.11
 
 #############################################################################
 # Aliases
@@ -553,7 +555,7 @@ allow-ads   = -block -filter{banners-by-size} -filter{banners-by-link}
 # Defaults
 #############################################################################
 { \
-+hide-forwarded-for-headers \
++change-x-forwarded-for{block} \
 +hide-from-header{block} \
 +set-image-blocker{pattern} \
 }
@@ -1490,6 +1492,8 @@ fritz.box/
 #MASTER# REMARKS: Actionsfile feedback item #2043327 2008-08-08
 # URL = http://kb.adobe.com/selfservice/viewContent.do?externalId=kb402747&sliceId=1
 .adobe.com
+# URL = http://qa.debian.org/popcon.php
+qa.debian.org/popcon\.php
 
 #############################################################################
 # Site-specific special rules:
@@ -1657,6 +1661,8 @@ view.samurajdata.se/ps\.php\?url=
 #MASTER# REMARKS: While this is a redirect, the token isn't part of the URL redirected to.
 # URL = http://www.amazon.com/gp/redirect.html/ref=cm_plog_item_link/105-3659773-0844420?ie=UTF8&location=http%3A%2F%2Fjoltawards.com%2F2007%2F&token=A07736D870C02EF10CB13BCC8A33C302F689BBBA
 .amazon.com/gp/redirect.html/.*location.*&token
+# URL = http://en.groundspring.org/EmailNow/pub.php?module=WebSignup&cmd=thankyou&gotoUrl=http%3A%2F%2Fwww.freebsdfoundation.org&gotoText=Return+to+Home+Page&listNames=The+FreeBSD+Foundation+Mailing+List
+.groundspring.org/
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
@@ -1794,6 +1800,8 @@ javabog.dk/ijk/
 .ikea.com/
 # URL = http://www.froscon.de/en/projects.html
 .froscon.de/
+# URL = http://www.fsfe.org/en/supporters
+.fsfe.org/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}