X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=default.action.master;h=500edefb305688e751fadb09d73c5a0c88a3f236;hb=55071296f2c4ef231216b4b5e9c72cada8d56e46;hp=fa9621b8cff7903026c8cdb7872daaef5cbe6d22;hpb=0d01e136dead255c4502e7330065d2201636718e;p=privoxy.git diff --git a/default.action.master b/default.action.master index fa9621b8..500edefb 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.206 2010/02/04 09:45:31 fabiankeil Exp $ +# $Id: default.action.master,v 1.209 2010/02/28 16:49:05 ler762 Exp $ # # Requires : This version requires Privoxy v3.0.11 or later due to # syntax changes. @@ -1025,6 +1025,8 @@ stats./c?rc/.*/uc.gif /(.*/)?(clear|blank|(trans_?|1x)?1).gif\?. #MASTER# BLOCK-REFERRER: http://actorstheatre.org 11/02/06 stats./.*\.gif\? +# Blocked URL = http://ad.yieldmanager.com/pixel?id=123456&t=2 +.yieldmanager.com/pixel\? #---------------------------------------------------------------------------- # JavaScripts and Texts for ad and popup generation @@ -1127,6 +1129,11 @@ bwp. #.yimg.com/a/.*/flash/ #MASTER# REMARKS: The above replaced with below. Actions file tracker #1645616 2007-01-27 .yimg.com/.*\.yimg\.com/a/ +#MASTER# REMARKS: Yahoo doesn't always have ".yimg.com/a/" in the URL for ads now 2010-02-28 +#MASTER# BLOCK-REFERRER: various yahoo pages +# Blocked URL = http://l.yimg.com/a/a/1-/flash/promotions/l3/intl/100214/300x250mfeyap.jpg +# Blocked URL = http://l.yimg.com/a/a/1-/flash/promotions/l3/intl/100219/300x250mfeya.gif +.yimg.com/.*/flash/promotions/.*\.(gif|jpg)$ bs*.gsanet.com bs*.einets.com .qkimg.net @@ -1256,6 +1263,9 @@ img.directtrack.com /tradedoubler/.*\.swf # Blocked URL = http://hstse.tradedoubler.com/file/142609/440x220.swf hstse.tradedoubler.com/.*\.swf +# Blocked URL = http://www.zdnetasia.com/2007/techguide/network/sponsor/i/logmein_mpu_whitepaper.gif +# Blocked URL = http://www.zdnetasia.com/2007/techguide/network/sponsor/sidebar.gif +www.zdnetasia.com/.*/sponsor/.*\.gif$ #---------------------------------------------------------------------------- # Cross-site user tracking @@ -1722,6 +1732,15 @@ www.peereboom.us/adsuck/ #MASTER# REMARKS: Ebay enlarge picture function doesn't work. # URL = http://include.ebaystatic.com/v4js/en_GB/e637i/SYS-LIGER_Omniture_e637i10177164_5_en_GB.js include.ebaystatic.com/.*omniture.*\.js +#MASTER# REMARKS: Allow Yahoo news and mail javascipt pages +# URL = http://l.yimg.com/d/combo?news/p/common/generic/news/p/common/generic/popular-searches-min-12622.js&news/p/common/generic/ads-min-11050.js&news/p/common/generic/foundation/popup-min-12622.js +.yimg.com/d/combo\? +#MASTER# REMARKS: Page formatting problems when .css files are blocked +# URL = http://www.networkworld.com/includes/styles/adstyles.css +# URL = http://www.sj.se/common/css/pop.css +# URL = http://l.yimg.com/d/combo?news/p/common/generic/ads-min-24248.css&news/p/common/generic/widgets-min-10270.css +# URL = http://news.zdnet.com/css/z/ads/hs.css +/.*\.css$ @@ -1746,17 +1765,6 @@ images.apple.com #MASTER# REMARKS: Various reports 09/16/06. This site also requires pop-ups. mail.google.* -#---------------------------------------------------------------------------- -# Semi-fragile, allow for blocks. -#---------------------------------------------------------------------------- -{-crunch-all-cookies -filter -fast-redirects -hide-referer} -# Sticky Actions = -crunch-incoming-cookies -crunch-outgoing-cookies -filter -fast-redirects -hide-referer -# URL = http://adserver.yahoo.com/ -#MASTER# REMARKS: This is much too broad for my taste. It forces me to add -#MASTER# REMARKS: a special yahoo section in my user.action file, just to -#MASTER# REMARKS: confirm my defaults in default.action. fk 2007-01-19 -.yahoo.com - #---------------------------------------------------------------------------- # Shopping and banking sites - allow cookies and pop-ups #---------------------------------------------------------------------------- @@ -1825,14 +1833,13 @@ www.ukc.ac.uk/cgi-bin/wac\.cgi\? .speedfind.de #MASTER# PROBLEM-URL: http://www.nytimes.com/ .nytimes.com -#MASTER# REMARKS: Yahoo logout URL after first redirect. fk 2007-01-19 -#MASTER# REMARKS: Logout fails if we fast-redirect to the URL after "done=". -#MASTER# REMARKS: Reported in support request #1635354. +#MASTER# REMARKS: Disable fast-redirects for all of yahoo.com/. +#MASTER# REMARKS: Apparently we can't keep up with maintaining more precise exceptions. # URL = http://login.yahoo.com/config/login?logout=1&.done=http://mail.yahoo.com&.src=ym&.intl=us -.yahoo.com/.*done=http +#MASTER# REMARKS: Reported in support request #1635354. +# URL = http://us.rd.yahoo.com/reg/login1/lisu/login/uk/ym/*http://edit.europe.yahoo.com/c onfig/login?.tries=1&.src=ym&.md5=&.hash=&.js=1&.last=&...kP=Y&.done=http://mail .yahoo.com&.pd=ym_ver=0&c=&login=XXX&passwd=XXX&.persistent =&.hash=1&.md5=1.yahoo.com/ #MASTER# REMARKS: Reported in support request #1802365. -# URL = http://us.rd.yahoo.com/reg/login1/lisu/login/uk/ym/*http://edit.europe.yahoo.com/c onfig/login?.tries=1&.src=ym&.md5=&.hash=&.js=1&.last=&...kP=Y&.done=http://mail .yahoo.com&.pd=ym_ver=0&c=&login=XXX&passwd=XXX&.persistent =&.hash=1&.md5=1 -.rd.yahoo.com/reg/login1/ +.yahoo.com/ # URL = http://validator.w3.org/check .w3.org #MASTER# PROBLEM-URL: http://www.ask.com/