X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=permissionsfile;h=a5c6aea7571b562fa0afb2439567ca1e87578643;hp=f6bff6efdd664384a347052ec75862a7efd3a50d;hb=7367a58d13c72ef9978b46f416f9b4735981bdfb;hpb=a3663c8fa4a3074211efa00923e28f29d493811a

diff --git a/permissionsfile b/permissionsfile
index f6bff6ef..a5c6aea7 100755
--- a/permissionsfile
+++ b/permissionsfile
@@ -3,7 +3,7 @@
 #
 # For information, see http://ijbswa.sourceforge.net/
 #
-# $Id: permissionsfile,v 1.7 2001/06/01 13:51:24 oes Exp $
+# $Id: permissionsfile,v 1.8 2001/06/01 17:05:32 jongfoster Exp $
 #
 #############################################################################
 # Syntax
@@ -102,9 +102,21 @@
 #    (Don't change the version number from 1.0 - after all, why tell them?)
 #
 # +image
-#    Treat this URL as an image.  This only matters if it's also blocked, in
-#    which case a "blocked" image rather than a HTML page will be sent.
-#    (According to the tinygif setting in the config file).
+#    Treat this URL as an image.  This only matters if it's also "+block"ed,
+#    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{http://i.j.b/ijb-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{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
@@ -182,6 +194,7 @@ c3 = +no-cookies-set -no-cookies-read
 +hide-referer{forge} \
 -hide-user-agent \
 -image \
++image-blocker{logo} \
 +no-cookies-read \
 +no-cookies-set \
 +no-popups \
@@ -231,7 +244,6 @@ privacy.net
 .dabs.com
 .overclockers.co.uk
 
-# This is a graphical-> text only conversion script
 {-fast-redirects}
 www.ukc.ac.uk/cgi-bin/wac\.cgi\?
 login.yahoo.com
@@ -268,7 +280,7 @@ www.carbuyer.com/cgi-carbuyer/getimage.cgi
 *.fxweb.com/v2-trackrun\.cgi
 195.63.104.61
 195.63.104.222
-213.165.64.3[89}
+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[12]/images.gmx.net/i4/images/.*/
@@ -1069,7 +1081,7 @@ 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
@@ -1088,7 +1100,7 @@ members.tripod.com/adm/popup/
 #count.exitexchange.com/exit/1100661
 #count.exitexchange.com/clients/navbar.html
 #(used in http://skyhivisuals.tripod.com/malfunctions_.htm)
--exitexchange.com
+.exitexchange.com
 
 #SourceForge ads.
 sfads.osdn.com
@@ -1100,7 +1112,6 @@ sfads.osdn.com
 .a.consumer.net
 
 #Lindsay.Marshall@newcastle.ac.uk suggested these, to kill Opera adverts:
-
 www.qksrv.net
 mirror.qkimg.net
 
@@ -1232,7 +1243,7 @@ www.iez-auktion.de
 .ibm.com
 .sgi.com
 
-# my banking stuff => no ads. last regexp for fast access :-)
+# my banking stuff => no ads.
 .comdirekt.de
 .comdirect.de
 .teledata.de