projects
/
privoxy.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove two debug messages with LOG_LEVEL_INFO.
[privoxy.git]
/
default.action.master
diff --git
a/default.action.master
b/default.action.master
index
3a5b877
..
e594159
100644
(file)
--- a/
default.action.master
+++ b/
default.action.master
@@
-9,7
+9,7
@@
#
# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
#
#
# File : $Source: /cvsroot/ijbswa/current/default.action.master,v $
#
-# $Id: default.action.master,v 1.14
2 2008/08/09 14:21:55
fabiankeil Exp $
+# $Id: default.action.master,v 1.14
7 2008/09/20 10:11:49
fabiankeil Exp $
#
# Requires : This version requires Privoxy v3.0.9 or later due to
# syntax changes.
#
# 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.
#
# 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.
# +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.
#
# 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,
# +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:
{{settings}}
#############################################################################
#MASTER# COMMENT: The minimum Privoxy version:
-for-privoxy-version=3.0.
9
+for-privoxy-version=3.0.
11
#############################################################################
# Aliases
#############################################################################
# Aliases
@@
-553,7
+555,7
@@
allow-ads = -block -filter{banners-by-size} -filter{banners-by-link}
# Defaults
#############################################################################
{ \
# Defaults
#############################################################################
{ \
-+
hide-forwarded-for-headers
\
++
change-x-forwarded-for{block}
\
+hide-from-header{block} \
+set-image-blocker{pattern} \
}
+hide-from-header{block} \
+set-image-blocker{pattern} \
}
@@
-1194,6
+1196,9
@@
feeds.feedburner.com/~r/.*/~4/
# Blocked URL = http://feeds.feedburner.com/~a/DilbertDailyStrip?a=Ebzxel
#MASTER# REMAKRKS: This looks like a pattern as well, maybe we should block feeds.feedburner.com/~a/ here.
feeds.feedburner.com/~a/DilbertDailyStrip\?
# Blocked URL = http://feeds.feedburner.com/~a/DilbertDailyStrip?a=Ebzxel
#MASTER# REMAKRKS: This looks like a pattern as well, maybe we should block feeds.feedburner.com/~a/ here.
feeds.feedburner.com/~a/DilbertDailyStrip\?
+#MASTER# BLOCK-REFERER: http://www.buch.de/
+# URL = http://track.webtrekk.de/471497967328727/wt.pl?p=177,de.buch.show.home,1,1024x768,24,1,1218816426275,0,884x653,0&enc1=%FC&enc2=iso-8859-1&st=view&la=en-US&np=Default%20Plugi
+track.webtrekk.de/
#----------------------------------------------------------------------------
# Specific counters (see above for generic patterns)
#----------------------------------------------------------------------------
# Specific counters (see above for generic patterns)
@@
-1487,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
#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:
#############################################################################
# Site-specific special rules:
@@
-1791,6
+1798,8
@@
javabog.dk/ijk/
.ikea.com/
# URL = http://www.froscon.de/en/projects.html
.froscon.de/
.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}
{-filter{banners-by-link}}
# Sticky Actions = -filter{banners-by-link}