X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=default.action.master;h=2b1022a050263da9a59e7f99989ff36b0b442e6f;hp=43b4d36342226b3ca74bf108e2901e0d18ef4e16;hb=287926d6fc5bac88dea5cebc5f26aadd15792965;hpb=1c182873a7f17106dbc704a7d14629cb0032b4ee

diff --git a/default.action.master b/default.action.master
index 43b4d363..2b1022a0 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.39 2006/10/24 10:53:55 hal9 Exp $
+#  $Id: default.action.master,v 1.51 2006/12/18 11:35:04 hal9 Exp $
 #
-#  Requires    :  This version requires Privoxy v3.0.4 or later due to 
+#  Requires    :  This version requires Privoxy v3.0.5 or later due to 
 #                 syntax changes.
 #
 #  Purpose     :  Default actions file, see
@@ -481,7 +481,7 @@
 {{settings}}
 #############################################################################
 #MASTER# COMMENT: The minimum Privoxy version:
-for-privoxy-version=3.0.5
+for-privoxy-version=3.0.6
 
 #############################################################################
 # Aliases
@@ -659,11 +659,14 @@ countr*.
 {+block}
 #MASTER# DONT-VERIFY (generic)
 /(.*/)?ad(\?|/|s|v|_?(image|se?rv|box)|cycle|rotate|mentor|click|f[ra]m|script|stream|fetch|log|space)
-/.*ads(new)?/
+/phpads(new)?/
 /(.*/)?(ad|all|nn|db|promo(tion)?)?[-_]?banner
 /(.*/)?(publicite|werbung|reklaa?m|annonse|maino(kset|nta|s)?/)
-/.*(count|track|compteur|adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt))
+/.*(count|track|compteur|(?<!relo)adframe|adse?rve?|banner)(er|run)?(\?|\.(pl|cgi|exe|dll|asp|php|cpt))
 /(.*/)?clicktrack
+#MASTER# REMARKS: Added 12/28/06 per Adam Piggott
+/(.*/)?(full)?pop[-_]?(up|over|under|open(er)?)?s?(/|\.)
+/(.*/)?((flash)?pop|live(cnt|count(er)?)).*\.(js|php|cgi)
 
 #############################################################################
 # Generic unblockers by path:
@@ -740,13 +743,15 @@ rcm.amazon.com
 #MASTER# BLOCK-REFERRER: http://www.hartware.de/news_40795.html
 /.*intellitxt/
 .intellitxt.com
+#MASTER# REMARKS: per Actions File tracker: #1597893 11/17/06, similar to intellitxt
+.kontera.com
 #MASTER# REMARKS: Video advertizer, owned by doubleclick.net.
 #MASTER# BLOCK-REFERRER: http://www.ign.com/ 09/17/06
 .klipmart.com
 #MASTER# BLOCK-REFERRER: http://gamespot.com 09/26/06
 #MASTER# REMARKS: adlog.com.com and ads.com.com
 ad*.com.com
-dw.com.com
+#MASTER# REMARKS: used in redirects: dw.com.com 12/18/06
 #MASTER# BLOCK-REFERRER: http://verizon.net 09/29/06
 sales.liveperson.net
 #MASTER# BLOCK-REFERRER: www.avclub.com/ 10/14/06
@@ -770,8 +775,6 @@ stats.*.ihost.com
 .webtrends.com
 #MASTER# BLOCK-REFERRER: http://tomshardware.com 09/29/06
 .tacoda.
-#MASTER# BLOCK-REFERRER: http://www.mplayernetwork.com/ 09/29/06
-.ign.com
 #MASTER# BLOCK-REFERRER: http://www.torrentazos.com 10/04/06
 ad.theadhost.com
 #MASTER# BLOCK-REFERRER: http://www.stuff.co.nz 10/06/06
@@ -790,6 +793,10 @@ ad.theadhost.com
 .zedo.com
 #MASTER# BLOCK-REFERRER: http://realtor.org 11/03/06
 .trk.sodoit.com/
+#MASTER# BLOCK-REFERRER: http://www.freenews.fr 11/23/06 Actionsfile feedback item #1597034
+.espace.netavenir.com
+#MASTER# BLOCK-REFERRER: http://www.powerdvd.com/ 12/28/06
+.hitfarm.com
 
 #----------------------------------------------------------------------------
 # Misc Web-bugs, JS and just plain Junk. Images here aren't normal images.
@@ -849,6 +856,19 @@ stats./c?rc/.*/uc.gif
 x*.alexa.com
 #MASTER# BLOCK-REFERRER: http://actorstheatre.org 11/02/06
 stats./.*\.gif\?
+#MASTER# BLOCK-REFERRER: http://mplayernetwork.com 11/07/06
+#MASTER# BLOCK-REFERRER: http://eetimes.com 09/26/06
+/event.ng/
+#MASTER# BLOCK-REFERRER: http://www.homedepot.com/ 11/08/06
+#MASTER# BLOCK-REFERRER: http://www.williams-sonoma.com/ 11/08/06
+/cm\?[tc]
+#MASTER# BLOCK-REFERRER: http://www.snapfiles.com/feedback/ 12/13/06 SF tracker
+.snapfiles.net/rotation/.*\.asp
+#MASTER# BLOCK-REFERRER: not provided. SF tracker #1616034 12/16/06
+#MASTER# COMMENT: JS pop-ups
+spa.snap.com/
+#MASTER# BLOCK-REFERRER: http://www.gamefaqs.com/computer/doswin/game/914819.html 12/18/06
+dw.com.com/clear/
 
 #----------------------------------------------------------------------------
 # JavaScripts for ad and popup generation
@@ -859,6 +879,10 @@ pagead*.googlesyndication./.*\.js
 /js\.ng/
 #MASTER# BLOCK-REFERRER: http://www.britannica.com/ 10/23/06
 /popunder
+#MASTER# BLOCK-REFERRER: http://www.pcmag.com/ 11/22/06 per SF Tracker # 1601148
+/js/slider\.js
+#MASTER# BLOCK-REFERRER: http://www.earthcore.com/ feedback item #1605385 12/14/06
+/t\.php\?cat=.*&kw=.*&sc=
 
 #############################################################################
 # Generic block-as-image patterns:
@@ -989,6 +1013,9 @@ ads-*.quarterserver.
 searchportal.information.com/
 #MASTER# BLOCK-REFERRER: http://www.nbc4.com/news/2672416/detail.html 10/17/06
 images.ibsys.com/
+#MASTER# BLOCK-REFERRER: http://www.rentalhouses.com/search_results.php?searchnew=1&citys_city=&citys_county=&citys_state=&ssubmit=Search&Szip=40205&keyword=&listingid=&strs_state=&strs_city=&strs_street= 11/05/06
+.lduhtrp.net/image
+
 
 #----------------------------------------------------------------------------
 # Cross-site user tracking
@@ -1042,6 +1069,10 @@ content.ipro.com
 log.go.com/log
 #MASTER# BLOCK-REFERRER: http://www.care2.com 10/18/06
 stats.indextools.com
+#MASTER# BLOCK-REFERRER: http://www.techcrunch.com/ 12/16/06 #1616497 3 urls.
+tra*.measuremap.com
+.eurekster.com/sidebar
+tra*.mybloglog.com
 
 #----------------------------------------------------------------------------
 # Specific counters (see above for generic patterns)
@@ -1091,6 +1122,8 @@ smartad.*.*.*
 #MASTER# BLOCK-REFERRER: http://www.heise.de/ 10/08/06
 #MASTER# BLOCK-REFERRER: http://www.spiegel.de/
 /RealMedia/ads/
+#MASTER# BLOCK-REFERRER: http://www.powerdvd.com 12/28/06 per SF tracker
+/top\.php\?d=.*\.[a-z]{2,5}
 
 #############################################################################
 # Site-specific unblockers:
@@ -1216,7 +1249,7 @@ cels.org/.*track
 .rubberslug.com
 .freebsd.org
 .fsf.org
-,gnu.org
+.gnu.org
 #MASTER# REMARKS: SF tracker 09/15/06
 adiumx.com
 #MASTER# UNBLOCK-REFERRER: http://google.com 10/01/06
@@ -1240,6 +1273,8 @@ edge.macworld.com
 .google.com/reader/
 #MASTER# REMARKS: Actionsfile Tracker 1587079 10/30/06
 .parcel2go.com/track
+#MASTER# REMARKS: Actionsfile Tracker #1612950 12/11/06
+.amazon.com/gp/gift-central/.*recip/
 
 #############################################################################
 # Site-specific special rules:
@@ -1318,7 +1353,8 @@ i.cnn.net/cnn/.*/clickability/button
 .rosettaproject.org
 #MASTER# PROBLEM-URL: http://www.quantum.com requires popups for downloads, etc. 09/11/06
 .quantum.com
-
+#MASTER# PROBLEM-URL: http://www.liberation.fr 11/23/06 Actions tracker
+.liberation.fr
 
 #----------------------------------------------------------------------------
 # Sometimes (i.e. often!) fast-redirects catches things by mistake
@@ -1560,6 +1596,8 @@ validator.w3.org/check\?uri=referer
 .petitiononline.com/mod_perl/signed.cgi
 #MASTER# REMARKS: Tracker bug report 1107806 09/26/06
 .telia.se
+#MASTER# REMARKS: XML validator that actually works.
+schneegans.de/sv/\?url=referer
 
 #----------------------------------------------------------------------------
 # These animated gifs are either useful or nice:
@@ -1674,6 +1712,8 @@ blogs.msdn.com
 #MASTER# PROBLEM-URL: http://uk.rd.yahoo.com/M=200059723.200849546.202365062.200414073/D=ukhmpg/S=15426100:TEAR/A=200396897/R=1119/id=img1_nocap_dial/*http://ad.uk.doubleclick.net/clk;5982435;8261020;g?http://www.lunnpoly.com
 #MASTER# REMARKS: Basically all of Yahoo's outbound links
 .*rd.yahoo.com/
+#MASTER# PROBLEM-URL: http://www.gamefaqs.com/computer/doswin/game/914819.html 12/18/06
+dw.com.com/
 
 {+block}
 #MASTER# COMMENTS: This section not checked 10/17/06 HB. Still out there?
@@ -1696,4 +1736,13 @@ blogs.msdn.com
 #}
 #www.versiontracker.com/
 
+#MASTER# REMARKS: If Privoxy is disabled, requests for config.privoxy.org/
+#MASTER# REMARKS: reach privoxy.org and are redirected to privoxy.org/config.
+#MASTER# REMARKS: The instructions tell the user to reload the page with
+#MASTER# REMARKS: Privoxy enabled to reach the configuration webinterface,
+#MASTER# REMARKS: to make this work we have to intercept the request and revert
+#MASTER# REMARKS: the redirection.
+{+redirect{http://config.privoxy.org/}}
+.privoxy.org/config
+
 #MASTER# set vi:nowrap