X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=f55b0696d8b9e11d03c3464f6f091488401414c7;hb=9aa2e46707a2eb1d5f39ec2f9528c36810cf469f;hp=e4b93786c1a6c9c009e4ce182d2f0d6e5defad4a;hpb=f747a5b01da796a639fadd6d89851c0711443e87;p=privoxy.git

diff --git a/default.action.master b/default.action.master
index e4b93786..f55b0696 100644
--- a/default.action.master
+++ b/default.action.master
@@ -11,7 +11,7 @@
 #
 #  File        :  $Source: /cvsroot/ijbswa/current/default.action.master,v $
 #
-#  $Id: default.action.master,v 1.296 2013/06/02 14:11:46 fabiankeil Exp $
+#  $Id: default.action.master,v 1.304 2014/05/26 10:47:04 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -880,6 +880,9 @@ pool.*.adhese.com/
 #MASTER# BLOCK-REFERRER: http://www.tradera.com/
 # Blocked URL = http://oskar.tradera.com/script.js
 oskar.tradera.com/
+#MASTER# BLOCK-REFERRER: http://www12.zippyshare.com/v/64444425/file.html
+# Blocked URL = http://www.adcash.com/script/java.php?option=rotateur&rotateur=146355
+.adcash.com/script/
 
 {+block{Might be a web-bug.} -handle-as-empty-document +handle-as-image}
 #MASTER# BLOCK-REFERRER: http://versiontracker.com and many others. 10/20/06
@@ -1882,6 +1885,20 @@ adn.speedtest.net
 .bundestag.de/
 # URL = http://www.rote-hilfe.de/images/banners/mitglied_werden_banner156.png
 .rote-hilfe.de/
+# URL = http://cs.stackexchange.com/posts/popup/close/suggest-originals/16678?_=1383517814677
+.stackexchange.com/(.*/)?popup
+# URL = http://cs.stackoverflow.com/posts/popup/close/suggest-originals/16678?_=1383517814677
+.stackoverflow.com/(.*/)?popup
+# URL = http://cs.serverfault.com/posts/popup/close/suggest-originals/16678?_=1383517814677
+.serverfault.com/(.*/)?popup
+# URL = http://cs.superuser.com/posts/popup/close/suggest-originals/16678?_=1383517814677
+.superuser.com/(.*/)?popup
+#MASTER# UNBLOCK-REFERRER: http://cologne.stopwatchingus.info/demo-12-april.html
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner.png
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-Koeln-12-04-14-Banner2.png
+# URL = http://cologne.stopwatchingus.info/images/banner/Demo-12-April.jpg
+.stopwatchingus.info/
+
 
 #############################################################################
 # Site-specific special rules:
@@ -2056,6 +2073,10 @@ webcache.googleusercontent.com/
 .google./sorry/\?continue?=
 # URL = http://www.microsofttranslator.com/bv.aspx?from=ru&to=en&a=http://ru.wikipedia.org/wiki/Privoxy
 .microsofttranslator.com/
+# URL = http://www.facebook.com/plugins/like.php?locale=de_DE&href=http%3A%2F%2Fwww.spiegel.de%2Fpolitik%2Fausland%2Fnsa-und-britischer-geheimdienst-knacken-systematisch-verschluesselung-a-920710.html&layout=standard&show_faces=false&width=480&action=recommend&font=verdana&colorscheme=light&height=22
+.facebook.com/plugins/like.php
+# URL = http://creativecommons.org/choose/zero/confirm?license-class=zero&name=...&actor_href=http%3A%2F%2Fexample.org%2F&work_title=...&work_jurisdiction=DE&confirm=confirm&understand=confirm&lang=de&field1=weiter
+creativecommons.org/
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2478,4 +2499,31 @@ TAG:^IMAGE-REQUEST$
 }
 TAG:^CSS-REQUEST$
 
+#############################################################################
+# Depends on +client-header-tagger{content-type}
+#############################################################################
+{-filter{html-annoyances} \
+ -filter{content-cookies} \
+ -filter{refresh-tags} \
+ -filter{img-reorder} \
+ -filter{banners-by-size} \
+ -filter{banners-by-link} \
+ -filter{webbugs} \
+ -filter{tiny-textforms} \
+ -filter{frameset-borders} \
+ -filter{iframes} \
+ -filter{demoronizer} \
+ -filter{shockwave-flash} \
+ -filter{quicktime-kioskmode} \
+ -filter{fun} \
+ -filter{crude-parental} \
+ -filter{site-specifics} \
+ -filter{no-ping} \
+ -filter{google} \
+ -filter{yahoo} \
+ -filter{msn} \
+ -filter{blogspot} \
+}
+TAG:^(application|text)/(x-)?javascript$
+
 #MASTER# set vi:nowrap