X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=actionsfile;fp=default.action;h=d3e14d4a08f4aee53b8cedb9771de5b37caeb1e1;hb=refs%2Ftags%2Fv_2_9_7;hp=b2c85ef5fc7dd279a7c9af5a0577f07804ed5e7a;hpb=472006f94cd350ff6e734c156cbbb93dab86d864;p=privoxy.git

diff --git a/default.action b/actionsfile
old mode 100644
new mode 100755
similarity index 76%
rename from default.action
rename to actionsfile
index b2c85ef5..d3e14d4a
--- a/default.action
+++ b/actionsfile
@@ -1,43 +1,10 @@
-######################################################################
-# 
-#  File        :  $Source: /cvsroot/ijbswa/current/basic.action,v $
-# 
-#  $Id: basic.action,v 1.3 2002/03/26 22:29:54 swa Exp $
+#############################################################################
+# Sample actions file for the Internet Junkbuster 2.9.x
 #
-#  Purpose     :  Default actions file, see
-#                 http://www.privoxy.org/faq/questions.html#CONFIGFILES
+# For information, see http://ijbswa.sourceforge.net/
 #
-#  Copyright   :  Written by and Copyright
-#                 Privoxy team. http://www.privoxy.org/
+# $Id: actionsfile,v 1.2 2001/06/29 21:45:41 oes Exp $
 #
-#                 Based on the Internet Junkbuster originally written
-#                 by and Copyright (C) 1997 Anonymous Coders and
-#                 Junkbusters Corporation.  http://www.junkbusters.com
-# 
-# We value your feedback. However, to provide you with the best support,
-# please note:
-#  
-#  * Use the support forum to get help:
-#    http://sourceforge.net/tracker/?group_id=11118&atid=211118
-#  * Submit bugs only thru our bug forum:
-#    http://sourceforge.net/tracker/?group_id=11118&atid=111118 
-#    Make sure that the bug has not already been submitted. Please try
-#    to verify that it is a Junkbuster bug, and not a browser or site
-#    bug first. If you are using your own custom configuration, please
-#    try the stock configs to see if the problem is a configuration
-#    related bug. And if not using the latest development snapshot,
-#    please try the latest one. Or even better, CVS sources.
-#  * Submit feature requests only thru our feature request forum:
-#    http://sourceforge.net/tracker/?atid=361118&group_id=11118&func=browse
-#      
-# For any other issues, feel free to use the mailing lists:
-# http://sourceforge.net/mail/?group_id=11118
-#    
-# Anyone interested in actively participating in development and related
-# discussions can join the appropriate mailing list here:
-# http://sourceforge.net/mail/?group_id=11118. Archives are available
-# here too.
-# 
 #############################################################################
 # Syntax
 #############################################################################
@@ -65,7 +32,7 @@
 #   is a domain-only pattern and will match any request to www.yahoo.com
 # 
 # www.example.com/
-#   means exactly the same (but is slightly less efficient)
+#   means exactly the same
 # 
 # www.example.com/index.html
 #   matches only the document /index.html on www.example.com
@@ -125,16 +92,12 @@
 # details.
 # 
 # Please note that matching in the path is CASE INSENSITIVE by default, but
-# you can switch to case sensitive by starting the pattern with the "(?-i)"
-# switch:
+# you can switch to case sensitive at any point in the pattern by using
+# the "(?-i)" switch:
 # 
 # www.example.com/(?-i)PaTtErN.*
 #   will match only documents whose path starts with PaTtErN in exactly this
 #   capitalization.
-#
-# Partially case-sensetive and partially case-insensitive patterns are
-# possible, but the rules about splitting them up are extremely complex
-# - see the PCRE documentation for more information.
 # 
 #############################################################################
 # Action Syntax
@@ -186,11 +149,6 @@
 #    most banner animations, but also has the risk of not showing the
 #    entire last frame (if it is only a delta to an earlier frame).
 #
-# +downgrade
-#    Downgrade HTTP/1.1 client requests to HTTP/1.0 and downgrade the
-#    responses as well. Use this action for servers that use HTTP/1.1
-#    protocol features that Junkbuster currently can't handle yet.
-#
 # +fast-redirects
 #    Many sites, like yahoo.com, don't just link to other sites.
 #    Instead, they will link to some script on their own server,
@@ -212,23 +170,9 @@
 #    request and send a local redirect back to your browser without
 #    contacting the remote site.
 #
-# +filter{name}
-#    Filter the website through one or more regular expression filters.
-#    Repeat for multiple filters.
-#   
-#    Filters predefined in the supplied re_filterfile include:
-#
-#     html-annoyances:  Get rid of particularly annoying HTML abuse
-#     js-annoyances:    Get rid of particularly annoying JavaScript abuse
-#     no-poups:         Kill all popups in JS and HTML
-#     frameset-borders: Give frames a border
-#     webbugs:          Squish WebBugs (1x1 invisible GIFs used for user tracking)
-#     no-refresh:       Automatic refresh sucks on auto-dialup lines
-#     fun:              Text replacements  for subversive browsing fun!
-#     nimda:            Remove (virus) Nimda code.
-#     banners-by-size:  Kill banners by size
-#     crude-parental:   Kill all web pages that contain the words "sex" or "warez"
-#
+# +filter
+#    Filter the website through the re_filterfile
+#    FIXME: The syntax should be +filter{filename}
 #
 # +hide-forwarded
 #    Block any existing X-Forwarded-for header, and do not add a new one.
@@ -267,50 +211,17 @@
 #    in which case a "blocked" image can be sent rather than a HTML page.
 #    See +image-blocker{} for the control over what is actually sent.
 #
+# +image-blocker{logo}
 # +image-blocker{blank}
-# +image-blocker{pattern}
-# +image-blocker{<URL>} with <url> being any valid image URL
+# +image-blocker{http://i.j.b/send-banner}
 #    Decides what to do with URLs that end up tagged with {+block +image}.
-#    There are 4 options:
-#      * "-image-blocker" will send a HTML "blocked" page, usually
-#        resulting in a "broken image" icon.
-#      * "+image-blocker{blank}" will send a 1x1 transparent image
-#      * "+image-blocker{pattern}" will send a 4x4 grey/white pattern
-#        which is less intrusive than the logo but easier to recognize
-#        than the transparent one.
-#      * "+image-blocker{<URL>}" will send a HTTP temporary redirect
-#        to the specified image URL.
-#
-#
-# +limit-connect{portlist}
-#   The CONNECT methods exists in HTTP to allow access to secure websites
-#   (https:// URLs) through proxies. It works very simply: The proxy
-#   connects to the server on the specified port, and then short-circuits
-#   its connections to the cliant and to the remote proxy.
-#   This can be a big security hole, since CONNECT-enabled proxies can
-#   be abused as TCP relays very easily.
-#   By default, i.e. in the absence of a +limit-connect action, Junkbuster
-#   will only allow CONNECT requests to port 443, which is the standard port
-#   for https.
-#   If you want to allow CONNECT for more ports than that, or want to forbid
-#   CONNECT altogether, you can specify a comma separated list of ports and port
-#   ranges (the latter using dashes, with the minimum defaulting to 0 and max to 65K):
-#
-#   +limit-connect{443} # This is the default and need no be specified.
-#   +limit-connect{80,443} # Ports 80 and 443 are OK.
-#   +limit-connect{-3, 7, 20-100, 500-} # Port less than 3, 7, 20 to 100, and above 500 are OK.
-#
-# +no-compression
-#    Prevent the website from compressing the data. Some websites do
-#    that, which is a problem for junkbuster, since +filter, +no-popup
-#    and +gif-deanimate will not work on compressed data. Will slow down
-#    connections to those websites, though.
-#
-# +no-cookies-keep
-#    If the website sets cookies, make sure they are erased when you exit
-#    and restart your web browser.  This makes profiling cookies useless,
-#    but won't break sites which require cookies so that you can log in
-#    or for transactions.
+#    There are 4 options.  "-image-blocker" will send a HTML "blocked" page,
+#    usually resulting in a "broken image" icon.  "+image-blocker{logo}"
+#    will send a "JunkBuster" image.  "+image-blocker{blank}" will send
+#    a 1x1 transparent GIF.  And finally, "+image-blocker{http://xyz.com}"
+#    will send a HTTP temporary redirect to the specified image - this 
+#    has the advantage of the icon being beeing cached by the browser,
+#    which will speed up the display.  
 #
 # +no-cookies-read
 #    Prevent the website from reading cookies
@@ -364,130 +275,86 @@
 # Useful aliases
 +no-cookies = +no-cookies-set +no-cookies-read
 -no-cookies = -no-cookies-set -no-cookies-read
+fragile     = -block -no-cookies -filter -fast-redirects -hide-referer -no-popups
+shop        = -no-cookies -filter -fast-redirects
 +imageblock = +block +image
 
-# Fragile sites should have the minimum changes
-fragile     = -block -deanimate-gifs -fast-redirects -filter -hide-referer -no-cookies -no-popups
-
-# Shops should be allowed to set persistent cookies
-shop        = -filter -no-cookies -no-cookies-keep
-
-# Your favourite blend of filters:
-#
-myfilters   = +filter{html-annoyances} +filter{js-annoyances} +filter{no-popups}\
-              +filter{webbugs} +filter{nimda} +filter{banners-by-size}
-
+#For people who don't like to type too much:  ;-)
+c0 = +no-cookies
+c1 = -no-cookies
+c2 = -no-cookies-set +no-cookies-read
+c3 = +no-cookies-set -no-cookies-read
 #... etc.  Customize to your heart's content.
 
 #############################################################################
 # Defaults
 #############################################################################
 {\
--add-header \
 -block \
--deanimate-gifs \
--downgrade \
 +fast-redirects \
-myfilters \
-+no-compression \
-+no-cookies-keep \
++filter \
 +hide-forwarded \
 +hide-from{block} \
 +hide-referer{forge} \
 -hide-user-agent \
 -image \
-+image-blocker{http://config.privoxy.org/send-banner} \
-+no-cookies-keep \
--no-cookies-read \
--no-cookies-set \
++image-blocker{http://i.j.b/send-banner} \
++no-cookies-read \
++no-cookies-set \
 +no-popups \
--vanilla-wafer \
--wafer \
++vanilla-wafer \
 }
 / # Match all URLs
 
-
 #############################################################################
 # A useful site for testing - shows all headers:
 # http://privacy.net/analyze/
 #############################################################################
-{+add-header{X-Privacy: Yes please} \
+{+add-header{X-Privacy: Yes please} #-add-header{*} \
 +add-header{X-User-Tracking: No thanks!} -filter}
 privacy.net
 
-
 #############################################################################
-# Test for new GIF deanimation feature.
-# Just try http://www.oesterhelt.org/deanimate-demo with and without it.
+# Permissions list
 #############################################################################
-{+deanimate-gifs{last}}
-www.oesterhelt.org/deanimate-demo
-
 
-#############################################################################
 # Sites that need cookies
-#
-# FIXME: Now cookies are allowed by default, do any of these sites
-# need persistent cookies?
-#############################################################################
+{-no-cookies}
+.javasoft.com
+.sun.com
+.yahoo.com
+.msdn.microsoft.com
 
-#{-no-cookies}
-#.javasoft.com
-#.sun.com
-#.yahoo.com
-#.msdn.microsoft.com
-#.sourceforge.net
-#.sf.net
-#www.nexgo.de
-#.myrealbox.com
-#mail.uni.de
-#e-tools.freenet.de
-#office.freenet.de
+# Alternative way of saying the same thing
+{-no-cookies-set -no-cookies-read}
+.sourceforge.net
+.sf.net
 
-#############################################################################
 # These sites are very complex and require
 # minimal interference.
-#############################################################################
 {fragile}
 .office.microsoft.com
 .windowsupdate.microsoft.com
-.deutsche-bank-24.de
 
-#############################################################################
 # Shopping sites - still want to block ads.
-#############################################################################
 {shop}
 .quietpc.com
 .worldpay.com   # for quietpc.com
 .jungle.com
 .scan.co.uk
 
-#############################################################################
 # These shops require pop-ups
-#############################################################################
 {shop -no-popups}
 .dabs.com
 .overclockers.co.uk
 
-#############################################################################
-# Sometimes fast-redirects catches things by mistake
-#############################################################################
 {-fast-redirects}
 www.ukc.ac.uk/cgi-bin/wac\.cgi\?
 login.yahoo.com
-edit.europe.yahoo.com
-.google.com
-.altavista.com/.*(like|url|link):http
-.altavista.com/trans.*urltext=http
-.speedfind.de
-.nytimes.com
 
-#############################################################################
 # Please don't re_filter code!
-#############################################################################
 {-filter}
-.sourceforge.net
-
+.cvs.sourceforge.net
 
 #############################################################################
 # Imagelist:
@@ -517,18 +384,13 @@ www.carbuyer.com/cgi-carbuyer/getimage.cgi
 *.fxweb.com/v2-trackrun\.cgi
 195.63.104.61
 195.63.104.222
-213.165.64.3[4-9]
-213.165.64.4[0-4]
+213.165.64.3[89]
+213.165.64.4[1-4]
 194.221.183.22[1-7]
-a196.g.akamai.net/7/196/2670/000[1-3]/images\.gmx\.net/.*images/.*/.*/
-/cgi-bin/ivw/CP/
+a196.g.akamai.net/7/196/2670/000[12]/images.gmx.net/i4/images/.*/
+/cgi-bin/ivw/CP/CGI
 151.189.8.213/Adimg
 151.189.8.193/Media
-.smartclicks.com/.*/smart(img|banner|host|bar|site)
-.linkexchange.com/.*/showl(ogo|e)
-MoneyBanner.de
-pixel.intares.net/cgi-bin/janus
-ar.atwola.com # This serves all ads for CNN and AOL
 
 #############################################################################
 # Blocklist:
@@ -544,48 +406,49 @@ ar.atwola.com # This serves all ads for CNN and AOL
 ###/*.*/(sponsor|banner)s?[0-9]?/
 ###/*.*/.*banner([-_]?[a-z0-9]+)?\.(gif|jpg)
 
-/?.*/_?(plain|live)?ads?(-banners)?/
-/?.*/abanners/
-/?.*/ad(sdna_image|gifs?)/
-/?.*/ad(server|stream|juggler)\.(cgi|pl|dll|exe)
-/?.*/adbanners/
-/?.*/ad_banner/
-/?.*/adserver
-/?.*/adstream\.cgi
-/?.*/adv((er)?ts?|ertis(ing|ements?))?/
-/?.*/anzei(gen)?/?
-/?.*/ban[-_]cgi/
-/?.*/banner_?ads/
-/?.*/banner_?anzeigen
-/?.*/bannerimage/
-/?.*/banners?/
-/?.*/banners?\.cgi/
-/?.*/cgi-bin/centralad/getimage
-/?.*/images/addver\.gif
-/?.*/images/advert\.gif
-/?.*/images/marketing/.*\.(gif|jpe?g)
-/?.*/place-ads
-/?.*/popupads/
-/?.*/promobar.*
-/?.*/publicite/
-/?.*/randomads/.*\.(gif|jpe?g)
-/?.*/rekla(ma|me|am)/.*\.(gif|jpe?g)
-/?.*/siteads/
-/?.*/sponsor.*\.gif
-/?.*/sponsors?[0-9]?/
-/?.*/ucbandeimg/
-/?.*/werb\..*
-/?.*/werbebanner/
-/?.*/werbung/.*\.(gif|jpe?g)
-/?.*/adv\.   # www.telegraaf.nl
-/?.*/advert[0-9]+\.jpg
-/?.*bann\.gif
-/?.*/ads/
+/.*/_?(plain|live)?ads?(-banners)?/
+/.*/abanners/
+/.*/ad(sdna_image|gifs?)/
+/.*/ad(server|stream|juggler)\.(cgi|pl|dll|exe)
+/.*/adbanners/
+/.*/adserver
+/.*/adstream\.cgi
+/.*/adv((er)?ts?|ertis(ing|ements?))?/
+/.*/anzei(gen)?/?
+/.*/ban[-_]cgi/
+/.*/banner_?ads/
+/.*/banner_?anzeigen
+/.*/bannerimage/
+/.*/banners?/
+/.*/banners?\.cgi/
+/.*/cgi-bin/centralad/getimage
+/.*/images/addver\.gif
+/.*/images/advert\.gif
+/.*/images/marketing/.*\.(gif|jpe?g)
+/.*/place-ads
+/.*/popupads/
+/.*/promobar.*
+/.*/publicite/
+/.*/randomads/.*\.(gif|jpe?g)
+/.*/reklama/.*\.(gif|jpe?g)
+/.*/reklame/.*\.(gif|jpe?g)
+/.*/reklaam/.*\.(gif|jpe?g)
+/.*/siteads/
+/.*/sponsor.*\.gif
+/.*/sponsors?[0-9]?/
+/.*/ucbandeimg/
+/.*/werb\..*
+/.*/werbebanner/
+/.*/werbung/.*\.(gif|jpe?g)
+/.*/adv\.   # www.telegraaf.nl
+/.*/advert[0-9]+\.jpg
+/.*bann\.gif
 /Media/Images/Adds/
 /_banner/
 /ad_images/
 /adgenius/
 /adimages/
+/.*/ads/
 /viewad/
 /adserve/
 /adverts/
@@ -624,24 +487,24 @@ ar.atwola.com # This serves all ads for CNN and AOL
 /worldnet/ad\.cgi
 /zhp/auktion/img/
 /cgi-bin/nph-adclick.exe/
-/?.*/Image/BannerAdvertising/
-/?.*/ad-bin/
-/?.*/adlib/server\.cgi
-/?.*/gsa_bs/gsa_bs.cmdl
+/.*/Image/BannerAdvertising/
+/.*/ad-bin/
+/.*/adlib/server\.cgi
+/.*/gsa_bs/gsa_bs.cmdl
 /autoads/
 /anz/pics/
 
 # for our finnish friends, by Kai Puolamaki <Kai.Puolamaki@iki.fi>
-/?.*/mainos/*.*/.*\.gif
-/?.*/mainos/*.*/.*\.jpe?g
+/.*/mainos/*.*/.*\.gif
+/.*/mainos/*.*/.*\.jpe?g
 
 # more from a finnish friend Petri Haapio <pha@iki.fi>
 cgi.tietovalta.fi
 .keltaisetsivut.fi/web/img/\.*gif
 .haku.net/pics/pana\.*gif
 .www.fi/guvat/\.*gif
-/?.*/(.*[-_.].*)?maino(kset|nta|s).*(/|\.(gif|html?|jpe?g|png))
-/?.*/(ilm(oitus)?|kampanja)(hallinta|kuvat?)(/|\.(gif|html?|jpe?g|png))
+/.*/(.*[-_.].*)?maino(kset|nta|s).*(/|\.(gif|html?|jpe?g|png))
+/.*/(ilm(oitus)?|kampanja)(hallinta|kuvat?)(/|\.(gif|html?|jpe?g|png))
 
 # and even more from a finnish friend Hannu Napari <Hannu.Napari@hut.fi>
 194.251.243.50/cgi-bin/banner
@@ -652,21 +515,21 @@ www.iltalehti.fi/ilmkuvat
 www.mtv3.fi/mainoskuvat
 
 # <jwz@jwz.org>
-/?.*/adfinity
-/?.*/[?]adserv
-/?.*/bizgrphx/
-/?.*/smallad2\.gif
-/?.*/ana2ad\.gif
-/?.*/adimg/
-/?.*/.*counter\.pl
-/?.*/spin_html/
-/?.*/images/topics/topicgimp\.gif
+/.*/adfinity
+/.*/[?]adserv
+/.*/bizgrphx/
+/.*/smallad2\.gif
+/.*/ana2ad\.gif
+/.*/adimg/
+/.*/.*counter\.pl
+/.*/spin_html/
+/.*/images/topics/topicgimp\.gif
 .discovery.com/.*banner_id
-/?.*/.*bannr\.gif
+/.*/.*bannr\.gif
 .cruel.com/images/
 .idrink.com/frm_bottom.htm
-/?.*/.*pb_ihtml\.gif
-/?.*/ph-ad.*\.focalink\.com
+/.*/.*pb_ihtml\.gif
+/.*/ph-ad.*\.focalink\.com
 /cgi-bin/adjuggler
 
 /we_ba/ # hausfrauenseite.de *bwhahahaaaaa*
@@ -699,38 +562,38 @@ www.mtv3.fi/mainoskuvat
 /.*s_msn\.gif
 /.*addchannel\.gif
 /.*adddesktop\.gif
-/?.*/ns4\.gif
-/?.*/v3sban\.gif
-/?.*/?FPCreated\.gif
-/?.*/opera35\.gif
-/?.*/opera13\.gif
-/?.*/opera_b\.gif
-/?.*/ie_horiz\.gif
-/?.*/ie_logo\.gif
+/.*/ns4\.gif
+/.*/v3sban\.gif
+/.*/?FPCreated\.gif
+/.*/opera35\.gif
+/.*/opera13\.gif
+/.*/opera_b\.gif
+/.*/ie_horiz\.gif
+/.*/ie_logo\.gif
 
 # ... and even more!
-/?.*/favicon\.ico
+/.*/favicon\.ico
 
 # generally useless information and promo stuff (commented out)
 #/.*/(counter|getpcbutton|BuiltByNOF|netscape|hotmail|vcr(rated)?|rsaci(rated)?|freeloader|cache_now(_anim)?|apache_pb|now_(anim_)?button|ie_?(buttonlogo|static?|.*ani.*)?)\.(gif|jpe?g)
 
-/?.*/images/na/us/brand/
-/?.*/advantage\.(gif|jpg)
-/?.*/advanbar\.(gif|jpg)
-/?.*/advanbtn\.(gif|jpg)
-/?.*/biznetsmall\.(gif|jpg)
-/?.*/utopiad\.(gif|jpg)
-/?.*/epipo\.(gif|jpg)
-/?.*/amazon([a-zA-Z0-9]+)\.(gif|jpg)
-/?.*/bnlogo.(gif|jpg)
-/?.*/buynow([a-zA-Z0-9]+)\.(gif|jpg)
+/.*/images/na/us/brand/
+/.*/advantage\.(gif|jpg)
+/.*/advanbar\.(gif|jpg)
+/.*/advanbtn\.(gif|jpg)
+/.*/biznetsmall\.(gif|jpg)
+/.*/utopiad\.(gif|jpg)
+/.*/epipo\.(gif|jpg)
+/.*/amazon([a-zA-Z0-9]+)\.(gif|jpg)
+/.*/bnlogo.(gif|jpg)
+/.*/buynow([a-zA-Z0-9]+)\.(gif|jpg)
 
 /p/d/publicid
 
 
 # for the dutch folks by a dutch friend gertjan@west.nl
-/?.*/Advertenties/
-/?.*/Adverteerders/
+/.*/Advertenties/
+/.*/Adverteerders/
 .netdirect.nl/nd_servlet/___
 
 # --------------------------------------------------------------------------
@@ -1039,8 +902,8 @@ www.forbes.com/tool/images/frontend/
 www.zserver.com
 www.spinbox.com
 .pathfinder.com/shopping/marketplace/images/
-/?.*/adbanner*
-/?.*/adgraphic*
+/.*/adbanner*
+/.*/adgraphic*
 static.wired.com/images
 .perso.estat.com/cgi-bin/perso/
 #dinoadserver1.roka.net
@@ -1086,11 +949,11 @@ home.talkcity.com/homepopup.html.*
 # Banners from Freeserve
 #banner.freeservers.com/cgi-bin/fs_adbar # fixed by above regexp
 # And those nasty va-popups !
-/?.*/?va_banner.html
+/.*/?va_banner.html
 # And an all-around hit against advert*.jpg
-/?.*/advert[0-9]+\.jpg
+/.*/advert[0-9]+\.jpg
 # And yet another Internet Explorer gif ...
-/?.*/ie_horiz\.gif
+/.*/ie_horiz\.gif
 # Some uninteresting buttons I think...
 .mircx.com/images/buttons/
 services.mircx.com/.*\.gif
@@ -1309,10 +1172,6 @@ www.linux-magazin.de/banner
 # The Register ads - oh, and all images in Register stories (sigh).
 www.theregister.co.uk/media/
 
-# Used on http://www.theregister.co.uk/
-# Sample advert URL:
-# http://secure.webconnect.net/cgi-bin/webconnecthome.dll?F467
-.webconnect.net
 
 # Dilbert:
 www.dilbert.com/comics/dilbert/images/.*_140x800.*\.gif
@@ -1326,11 +1185,11 @@ www.stattrack.com/stats/
 #Now they're Yahoo GeoCities, their junk is in a different place.
 ##geo.yahoo.com/serv
 ##visit.geocities.com/visit.gif
-.yimg.com/?.*/www.geocities.com/js_source
+.yimg.com/.*/www.geocities.com/js_source
 #http://us.toto.geo.yahoo.com/toto?s=76001086
 .geo.yahoo.com
 .visit.geocities.com
-.yimg.com/?.*/www.geocities.com/
+.yimg.com/.*/www.geocities.com/
 
 #http://counter16.bravenet.com/counter.php
 counter*.
@@ -1366,7 +1225,7 @@ logout.gmx.net
 logout.tvspielfilm.de
 gmx.tvspielfilm.de
 www.freenet.de/customerindex\.html
-/?.*/phpAds
+/.*/phpAds
 .fxweb.com/v2-trackrun\.cgi
 rtldating.peopleunited.de
 .advertising.com
@@ -1378,13 +1237,12 @@ fourohfour.nbci.com/Members404Error.php3
 .adlink.de
 www.fair-ist-mehr.de/cgi-bin/bt.pl
 .linkexchange.
-/?.*/adpage.asp
+/.*/adpage.asp
 /ADS
 .net-on.net
 rstrip.namezero.com
 62.26.220.2
 .doubleclick.net
-.adserver.yahoo.com
 
 #############################################################################
 {-block}
@@ -1392,7 +1250,6 @@ rstrip.namezero.com
 include.ebay.com
 cpan.valueclick.com
 www.userfriendly.org/images/banners/banner_dp_heart\.gif
-advogato.org
 
 #Why were these in the Waldherr blockfile?
 #www.hitbox.com
@@ -1497,8 +1354,10 @@ www.iez-auktion.de
 
 
 # Jon's addition: MSDN
+
 .msdn.microsoft.com
 
+
 #js
 .adbusters.com
 .freemail*.web.de/online/ordner/anzeigen
@@ -1506,8 +1365,10 @@ foggy.sda.t-online.de
 .us.i1.yimg.com/us.yimg.com/i/pim/ad2.gif
 www.nexgo.de/.*/bg_banner.jpg
 
-# .*ads. matches prdownloads.sourceforge.net and many other download sites
-# The fix is:
-.*downloads.
+# New GIF deanimation feature. Just try http://www.oesterhelt.org/deanimate-demo
+# with and without it.
+#
+{+deanimate-gifs{last}}
+www.oesterhelt.org/deanimate-demo
 
 # End of file