X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=re_filterfile;h=04acbaea8f66e114c1e24cf10609a5144572bedc;hb=4bb8225677e05ca9fe842f6343479fd4f875a022;hp=76d9374f8e12a405eac0d8b71df04095092792f4;hpb=897c7026b0b2f6d5d9cb923742fe69f8845d84ba;p=privoxy.git
diff --git a/re_filterfile b/re_filterfile
index 76d9374f..04acbaea 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -1,4 +1,4 @@
-# ********************************************************************
+# ********************************************************************
#
# File : $Source: /cvsroot/ijbswa/current/re_filterfile,v $
#
@@ -7,10 +7,6 @@
# Copyright : Written by and Copyright (C) 2001 the SourceForge
# IJBSWA team. http://ijbswa.sourceforge.net
#
-# Based on the Internet Junkbuster originally written
-# by and Copyright (C) 1997 Anonymous Coders and
-# Junkbusters Corporation. http://www.junkbusters.com
-#
# This program is free software; you can redistribute it
# and/or modify it under the terms of the GNU General
# Public License as published by the Free Software
@@ -31,6 +27,14 @@
#
# Revisions :
# $Log: re_filterfile,v $
+# Revision 1.8 2001/06/29 13:34:00 oes
+# - Added explanation for U and T options
+# - Added hint on image replacement by CGI call
+# - Fixed bug in banner-by-size jobs
+#
+# Revision 1.7 2001/06/19 14:21:56 oes
+# Fixed microsuck line
+#
# Revision 1.6 2001/06/09 14:01:57 swa
# header. cosmetics. default: no messing ala microsuck.
#
@@ -42,10 +46,15 @@
# For Details see the perlre, perlop and pcre manpages.
# Note that you are free to choose the delimter as you see fit.
#
-# Note: in addidion to the Perl-options egimosx, U is supported
-# and turns the default to ungreedy matching. Add ? to quantifiers
-# to switch back to greedy.
-#
+# Note: In addidion to the Perl options egimosx, the following nonstandard
+# options are supported:
+#
+# 'U' turns the default to ungreedy matching. Add ? to quantifiers to
+# switch back to greedy.
+# 'T' (trivial) prevents parsing for backreferences in the substitute.
+# Use if you want to include text like '$&' in your substitute without
+# quoting.
+#
# ********************************************************************/
#
@@ -102,31 +111,32 @@ s/status='.*?';*//ig
#
# Kill banners by size:
# (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html)
-#
-# ********************************************************************/
-s|]*?(width=['"]?468\D)[^>]*(height=['"]?60\D)[^>]*>||sig
-s|]*?(width=['"]?234\D)[^>]*(height=['"]?60\D)[^>]*>||sig
-s|]*?(width=['"]?88\D)[^>]*(height=['"]?31\D)[^>]*>||sig
-s|]*?(width=['"]?120\D)[^>]*(height=['"]?90\D)[^>]*>||sig
-s|]*?(width=['"]?120\D)[^>]*(height=['"]?60\D)[^>]*>||sig
-s|]*?(width=['"]?160\D)[^>]*(height=['"]?600\D)[^>]*>||sig
-s|]*?(width=['"]?120\D)[^>]*(height=['"]?600\D)[^>]*>||sig
-s|]*?(width=['"]?125\D)[^>]*(height=['"]?125\D)[^>]*>||sig
-s|]*?(width=['"]?120\D)[^>]*(height=['"]?240\D)[^>]*>||sig
-s|]*?(width=['"]?180\D)[^>]*(height=['"]?150\D)[^>]*>||sig
-s|]*?(width=['"]?300\D)[^>]*(height=['"]?250\D)[^>]*>||sig
-s|]*?(width=['"]?250\D)[^>]*(height=['"]?250\D)[^>]*>||sig
-s|]*?(width=['"]?240\D)[^>]*(height=['"]?400\D)[^>]*>||sig
-s|]*?(width=['"]?336\D)[^>]*(height=['"]?280\D)[^>]*>||sig
+# Note: Use http://i.j.b/send-banner?type=trans for a transparent 1x1 gif
+# ********************************************************************/
+s|]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>||sig
+s|]*?(width=['"]?234\D)[^>]*(height=['"]?60[^>]*?)>||sig
+s|]*?(width=['"]?88\D)[^>]*(height=['"]?31[^>]*?)>||sig
+s|]*?(width=['"]?120\D)[^>]*(height=['"]?90[^>]*?)>||sig
+s|]*?(width=['"]?120\D)[^>]*(height=['"]?600[^>]*?)>||sig
+s|]*?(width=['"]?120\D)[^>]*(height=['"]?60[^>]*?)>||sig
+s|]*?(width=['"]?160\D)[^>]*(height=['"]?600[^>]*?)>||sig
+s|]*?(width=['"]?125\D)[^>]*(height=['"]?125[^>]*?)>||sig
+s|]*?(width=['"]?120\D)[^>]*(height=['"]?240[^>]*?)>||sig
+s|]*?(width=['"]?180\D)[^>]*(height=['"]?150[^>]*?)>||sig
+s|]*?(width=['"]?300\D)[^>]*(height=['"]?250[^>]*?)>||sig
+s|]*?(width=['"]?250\D)[^>]*(height=['"]?250[^>]*?)>||sig
+s|]*?(width=['"]?240\D)[^>]*(height=['"]?400[^>]*?)>||sig
+s|]*?(width=['"]?336\D)[^>]*(height=['"]?280[^>]*?)>||sig
-s|]*?(width=['"]?200\D)[^>]*(height=['"]?50\D)[^>]*>||sig
+# Where is that from?
+s|]*?(width=['"]?200\D)[^>]*(height=['"]?50[^>]*?)>||sig
# ********************************************************************/
#
# Squish WebBugs:
#
# ********************************************************************/
-s/]*?(width|height)\s+=\s+['"]?1\D[^>]*?(width|height)\s+=\s+['"]?1\D[^>]*>//sig
+s/]*?(width|height)\s+=\s+['"]?1\D[^>]*?(width|height)\s+=\s+['"]?1\D[^>]*?>//sig
# ********************************************************************/
#