X-Git-Url: http://www.privoxy.org/gitweb/?p=privoxy.git;a=blobdiff_plain;f=re_filterfile;h=13651096e97d2d8beba1a43332b08413a1c33724;hp=0c6c9f6d8f2488546cffa2ddc7d09555c0c31783;hb=43c6915d10f5e6357d30541a5db24918c9bb1e99;hpb=b0ac224e1ea7a10259f757c34153bc42c13c8fa0

diff --git a/re_filterfile b/re_filterfile
index 0c6c9f6d..13651096 100644
--- a/re_filterfile
+++ b/re_filterfile
@@ -27,6 +27,23 @@
 # 
 #  Revisions   :
 #     $Log: re_filterfile,v $
+#     Revision 1.12  2001/10/07 15:46:42  oes
+#     Followed Guy's proposal to change the document.cookie job
+#
+#     Revision 1.11  2001/09/21 12:34:00  joergs
+#     Added filter to replace "Nimda" code by a warning.
+#
+#     Revision 1.10  2001/07/20 11:04:26  oes
+#     Added Rodneys javascript cookie filter
+#
+#     Revision 1.9  2001/07/13 14:03:48  oes
+#     Elimiated yet another bug in the banner-by-size jobs. Shame on me!
+#
+#     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
 #
@@ -91,12 +108,20 @@ s/(<frameset[^>]+?)frameborder=['"]?(no|0)['"]?/$1/ig
 
 # ********************************************************************/
 #
-# The status bar is for displaying link targets, not pointless buzzwords.
+# The status bar is for displaying link targets, not pointless descriptions.
 # Again, check it out on http://www.airport-cgn.de/
 #
 # ********************************************************************/
 s/status='.*?';*//ig
 
+# ********************************************************************/
+#
+# Get rid of Javascript cookies, like found on privacy.net:
+#
+# ********************************************************************/
+
+s|(document\.cookie)([ \t\r\n]*=)|documenZapCooky$2|g
+
 # ********************************************************************/
 #
 # Kill *all* popups a la popup.c. (But for *all* sites, so I wouldn't do that.)
@@ -108,30 +133,30 @@ s/status='.*?';*//ig
 # (Sizes from http://www.iab.net/iab_banner_standards/bannersizes.html)
 # Note: Use http://i.j.b/send-banner?type=trans for a transparent 1x1 gif
 # ********************************************************************/
-s|<img\s+[^>]*?(width=['"]?468\D)[^>]*(height=['"]?60)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?234\D)[^>]*(height=['"]?60)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?88\D)[^>]*(height=['"]?31)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?90)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?600)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?60)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?160\D)[^>]*(height=['"]?600)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?125\D)[^>]*(height=['"]?125)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?240)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?180\D)[^>]*(height=['"]?150)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?300\D)[^>]*(height=['"]?250)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?250\D)[^>]*(height=['"]?250)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?240\D)[^>]*(height=['"]?400)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
-s|<img\s+[^>]*?(width=['"]?336\D)[^>]*(height=['"]?280)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?468\D)[^>]*(height=['"]?60[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?234\D)[^>]*(height=['"]?60[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?88\D)[^>]*(height=['"]?31[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?90[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?600[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?60[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?160\D)[^>]*(height=['"]?600[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?125\D)[^>]*(height=['"]?125[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?120\D)[^>]*(height=['"]?240[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?180\D)[^>]*(height=['"]?150[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?300\D)[^>]*(height=['"]?250[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?250\D)[^>]*(height=['"]?250[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?240\D)[^>]*(height=['"]?400[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?336\D)[^>]*(height=['"]?280[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
 
 # Where is that from?
-s|<img\s+[^>]*?(width=['"]?200\D)[^>]*(height=['"]?50)[^>]*?>|<img src=http://i.j.b/send-banner $1 $2>|sig
+s|<img\s+[^>]*?(width=['"]?200\D)[^>]*(height=['"]?50[^>]*?)>|<img src=http://i.j.b/send-banner $1 $2>|sig
 
 # ********************************************************************/
 #
 # Squish WebBugs:
 #
 # ********************************************************************/
-s/<img\s+[^>]*?(width|height)\s+=\s+['"]?1\D[^>]*?(width|height)\s+=\s+['"]?1\D[^>]*?>/<!-- Squished WebBug -->/sig
+s/<img\s+[^>]*?(width|height)\s*=\s*['"]?1\D[^>]*?(width|height)\s*=\s*['"]?1(\D[^>]*?)?>/<!-- Squished WebBug -->/sig
 
 # ********************************************************************/
 #
@@ -157,3 +182,10 @@ s/microsoft(?!.com)/MicroSuck/ig
 #
 # ********************************************************************/
 s/(\w+) was tired/<b>$1 needed more coffee<\/b>/ig
+
+# ********************************************************************/
+#
+# Remove Nimda code.
+#
+# ********************************************************************/
+s%<script language="JavaScript">(window\.open|1;''\.concat)\("readme\.eml", null, "resizable=no,top=6000,left=6000"\)</script>%<br><hr><font size=7><b>Internet J</b></font><b><font size=6>UNK</font><font size=5 color="red"><i>BUSTER</i></font></b><font size=7> WARNING: This Server is infected with <a href="http://www.cert.org/advisories/CA-2001-26.html">Nimda</a>!</font>%g