X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=a9d330727ddd9ec1997df249a16f725f9cd16db8;hp=7536ccdb376166cccd05ed9a9e9934b563a5c7fe;hb=f090cfd5f7af75c6133110de7db72ac39d9ec870;hpb=a3f35273c4ec8767bbe6261afb9c162e6d431b4a

diff --git a/default.action.master b/default.action.master
index 7536ccdb..a9d33072 100644
--- a/default.action.master
+++ b/default.action.master
@@ -9,9 +9,9 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 # 
-#  $Id: default.action.master,v 1.148 2008/09/21 11:36:59 fabiankeil Exp $
+#  $Id: default.action.master,v 1.153 2008/12/13 10:05:29 fabiankeil Exp $
 #
-#  Requires    :  This version requires Privoxy v3.0.9 or later due to 
+#  Requires    :  This version requires Privoxy v3.0.11 or later due to 
 #                 syntax changes.
 #
 #  Purpose     :  Default actions file, see
@@ -1193,12 +1193,17 @@ rss.slashdot.org/~r/Slashdot/slashdot/~4/
 # Blocked URL = http://feeds.feedburner.com/~r/PCLoadLetter/~4/270448381
 #MASTER# REMAKRKS: This seem to be a common pattern for web bugs in feedburner feeds.
 feeds.feedburner.com/~r/.*/~4/
+# Blocked URL = http://feedproxy.google.com/~r/DilbertDailyStrip/~4/y_kXD1z1HO0
+feedproxy.google.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\?
 #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/
+# URL = http://feedads.googleadservices.com/~a/dPlpGU767u4D4kVO8EGuUlnf1Q0/i
+# URL = http://feedads.googleadservices.com/~at/EpX-FnAXxwdaBSq-GRze37-rG0M/i
+.googleadservices.com/~
 
 #----------------------------------------------------------------------------
 # Specific counters (see above for generic patterns)
@@ -1461,6 +1466,9 @@ switch.atdmt.com/action/
 .wikimedia.org/
 # URL = http://en.wikipedia.org/wiki/Advertisement
 .wikipedia.org/
+#MASTER# REMARKS Actionsfile feedback item #2299717 2008-11-16
+# URL = http://en.wiktionary.org/wiki/advertisement
+.wiktionary.org/
 # URL = http://curl.haxx.se/docs/adv_20070710.html
 .haxx.se/docs/adv_
 # URL = http://www.google.com/adsense/
@@ -1494,6 +1502,16 @@ fritz.box/
 .adobe.com
 # URL = http://qa.debian.org/popcon.php
 qa.debian.org/popcon\.php
+#MASTER# REMARKS: We also use this as a light character class test, therefore the additional URL directives.
+# URL = http://www.proaurum.de/bannerA2/image/pro_master_r3_01_04.gif
+# URL = http://www.proaurum.de/bannerA1/image/limitorder2.gif
+# URL = http://www.proaurum.de/bannerA3/image/pro_master_r5_banken_01_01+.gif
+# URL = http://www.proaurum.de/bannerB2/image/pro_banner_mitte.gif
+# URL = http://www.proaurum.de/bannerB1_/image/pro_banner_links.gif
+# URL = http://www.proaurum.de/bannerC1/image/partner1.png
+.proaurum.de/banner[ABC]\d_?/
+# URL = http://www.goldmoney.com/en/images/home/banner_r4_c1.gif
+.goldmoney.com/
 
 #############################################################################
 # Site-specific special rules:
@@ -1663,6 +1681,10 @@ view.samurajdata.se/ps\.php\?url=
 .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/
+# URL = http://www1.landsend.de/pp/undefined/images/error.gif?onerr=true&ts=1227969386837&file=http%3A//s7.landsend.com/is-viewers/dhtml/include/sj_textloader.js%3Fver%3Dle.1&line=0&msg=Script%20error.&sid=
+.landsend.de/
+# URL = http://www.youtube.com/swf/l.swf?swf=http%3A//s.ytimg.com/yt/swf/cps-vfl68942.swf&video_id=2cpd6rHIfyA&rel=1&showsearch=1&eurl=&iurl=http%3A//i3.ytimg.com/vi/2cpd6rHIfyA/hqdefault.jpg&sk=5E3I2RCcOLknk1qyI_JgVVnb8FKwgpHzC&use_get_video_info=1&load_modules=1&fs=1&hl=en
+.youtube.com/swf/.*swf=
 
 #----------------------------------------------------------------------------
 # No filtering for sourcecode or other automatically parsed content
@@ -1704,6 +1726,9 @@ webmail.
 .wiki*.
 .*wiki.
 /.*wiki/
+#MASTER# REMARKS Actionsfile feedback item #2299717 2008-11-16
+# URL = http://en.wiktionary.org/
+.wiktionary.org/
 #MASTER# REMARKS: protect some google projects from accidental JS/HTML tampering, etc
 maps.google.
 .google.com/(calendar|reader)
@@ -1802,6 +1827,8 @@ javabog.dk/ijk/
 .froscon.de/
 # URL = http://www.fsfe.org/en/supporters
 .fsfe.org/
+# URL = http://www.couchsurfing.com/mapsurf.html
+.couchsurfing.com/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}