X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=5605d75334d02c484d7f7cdc138891ea984dca1f;hp=bfc55b67a3b1527752253067f9d142b330f6acf9;hb=40667ee8dd628081b613f75c8fb0040a7ef819ee;hpb=d0014f78905227f7ecab77f65d453fd24f4e9ecf

diff --git a/default.action.master b/default.action.master
index bfc55b67..5605d753 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.284 2013/02/28 17:27:42 fabiankeil Exp $
+#  $Id: default.action.master,v 1.292 2013/05/28 14:39:05 fabiankeil Exp $
 #
 #  Requires    :  This version requires Privoxy v3.0.11 or later due to
 #                 syntax changes.
@@ -202,11 +202,13 @@
 #
 #     image-requests:    Tags detected image requests as "IMAGE-REQUEST".
 #     css-requests:      Tags detected CSS requests as "CSS-REQUEST".
+#     range-requests:    Tags range requests as "RANGE-REQUEST".
 #     client-ip-address: Tags the request with the client's IP address.
 #     http-method:       Tags the request with its HTTP method.
 #     allow-post:        Tags POST requests as "ALLOWED-POST".
 #     complete-url:      Tags the request with the whole request URL.
 #     user-agent:        Tags the request with the complete User-Agent header.
+#     referer:           Tags the request with the complete Referer header.
 #     privoxy-control:   Creates tags with the content of X-Privoxy-Control headers.
 #
 # +content-type-overwrite
@@ -275,10 +277,10 @@
 #    Filters predefined in the supplied default.filter include:
 #
 #     js-annoyances:       Get rid of particularly annoying JavaScript abuse.
-#     js-events:           Kill all JS event bindings and timers (Radically destructive! Only for extra nasty sites).
+#     js-events:           Kill JavaScript event bindings and timers (Radically destructive! Only for extra nasty sites).
 #     html-annoyances:     Get rid of particularly annoying HTML abuse.
 #     content-cookies:     Kill cookies that come in the HTML or JS content.
-#     refresh-tags:        Kill automatic refresh tags (for dial-on-demand setups).
+#     refresh-tags:        Kill automatic refresh tags if refresh time is larger than 9 seconds.
 #     unsolicited-popups:  Disable only unsolicited pop-up windows.
 #     all-popups:          Kill all popups in JavaScript and HTML.
 #     img-reorder:         Reorder attributes in <img> tags to make the banners-by-* filters more effective.
@@ -288,6 +290,7 @@
 #     tiny-textforms:      Extend those tiny textareas up to 40x80 and kill the hard wrap.
 #     jumping-windows:     Prevent windows from resizing and moving themselves.
 #     frameset-borders:    Give frames a border and make them resizable.
+#     iframes:             Removes all detected iframes. Should only be enabled for individual sites.
 #     demoronizer:         Fix MS's non-standard use of standard charsets.
 #     shockwave-flash:     Kill embedded Shockwave Flash objects.
 #     quicktime-kioskmode: Make Quicktime movies saveable.
@@ -642,8 +645,6 @@ ad*.
 *banner*.
 count*.
 *counter.
-#MASTER# PROBLEM URL: http://www.newegg.com
-promotions.
 #MASTER# BLOCK-REFERRER: http://tech.cybernetnews.com/
 # Blocked URL = http://metrics.performancing.com/
 metrics.
@@ -841,8 +842,6 @@ js.adlink.net/
 #MASTER# BLOCK-REFERRER: http://www.chip.de/artikel/c_artikelunterseite_10423683.html
 # Blocked URL = http://pagead.googlesyndication.example.com/foo/bar/baz.js
 pagead*.googlesyndication./.*\.js
-#MASTER# BLOCK-REFERRER: http://www.pcmag.com/ 11/22/06 per SF Tracker # 1601148
-/js/slider\.js
 #MASTER# BLOCK-REFERRER: http://floodle.net 2007-01-21 SF tracker
 scripts.chitika.net/.*\.js
 #MASTER# BLOCK-REFERRER: via Yahoo groups
@@ -1869,6 +1868,11 @@ websupport.wdc.com/
 # URL = http://www.smugmug.com/community/ADVrider
 # URL = http://www.siteinfotool.com/advrider.com
 /.*ADVrider
+#MASTER# UNBLOCK-REFERRER: http://www.speedtest.net/
+#MASTER# REMARKS: Support request #3612908  2013-05-08 07:31:46 PDT
+#MASTER# REMARKS: Appears to be a content delivery subdomain for the parent domain
+# URL = http://adn.speedtest.net
+adn.speedtest.net
 
 #############################################################################
 # Site-specific special rules:
@@ -2041,6 +2045,8 @@ webcache.googleusercontent.com/
 .googleapis.com/
 # URL = http://www.google.com.au/sorry/?continue=http://www.google.com.au/search%3Fhl%3Den%26tbo%3Dd%26output%3Dsearch%26sclient%3Dpsy-ab%26q%3Dnew%2Bcars%26btnG%3D
 .google./sorry/\?continue?=
+# URL = http://www.microsofttranslator.com/bv.aspx?from=ru&to=en&a=http://ru.wikipedia.org/wiki/Privoxy
+.microsofttranslator.com/
 
 {+redirect{s@.*url=@http://@} -block}
 # Sticky Actions = +redirect -block
@@ -2202,6 +2208,10 @@ javabog.dk/ijk/
 .couchsurfing.org/
 # URL = http://www.thinkgeek.com/tshirts-apparel/unisex/generic/
 .thinkgeek.com/
+# URL = http://www.dgb-tagungszentren.de/hattingen/unsere-extras
+.dgb-tagungszentren.de/
+# URL = http://creativecommons.org/licenses/
+creativecommons.org/
 
 {-filter{banners-by-link}}
 # Sticky Actions = -filter{banners-by-link}