- Don't let img-reorder touch width attributes

  that aren't followed by either whitespace or '>',
  as those usually indicate onclick nonsense.
  Problem and solution reported by Glenn Washburn in #2014552.
- While at it, don't use more groups than necessary.

diff --git a/default.filter b/default.filter
index 0d4e06b..2a791f3 100644 (file)
--- a/default.filter
+++ b/default.filter
@@ -2,7 +2,7 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 

-#  $Id: default.filter,v 1.62 2008/06/21 17:02:03 fabiankeil Exp $
+#  $Id: default.filter,v 1.63 2008/06/27 12:53:41 fabiankeil Exp $

 #
 #  Purpose     :  Rules to process the content of web pages
 # 
 #
 #  Purpose     :  Rules to process the content of web pages
 # 


@@ -226,7 +226,7 @@ FILTER: img-reorder Reorder attributes in <img> tags to make the banners-by-* fi
 s|<img\s+?([^>]*) src\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2 $1|siUg
 s|<img\s+?([^>]*) src\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
 
 s|<img\s+?([^>]*) src\s*=\s*(['"])([^>\\\2]+)\2|<img src=$2$3$2 $1|siUg
 s|<img\s+?([^>]*) src\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
 

-s|<img (src=(?:(['"])[^>\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*(["']?)(\d+?)\4|<img $1 width=$4$5$4$3|siUg
+s|<img (src=(?:(['"])[^>\\\\2]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5[\s>])|<img $1 width=$4$3|siUg

 
 
 #################################################################################
 
 
 #################################################################################


@@ -830,6 +830,10 @@ s@^X-Privoxy-Control:.*@@i
 #
 #  Revisions   :
 #     $Log: default.filter,v $
 #
 #  Revisions   :
 #     $Log: default.filter,v $

+#     Revision 1.63  2008/06/27 12:53:41  fabiankeil
+#     Make sure the taggers css-requests and image-requests
+#     only match at the beginning of the header.
+#

 #     Revision 1.62  2008/06/21 17:02:03  fabiankeil
 #     Fix typo.
 #
 #     Revision 1.62  2008/06/21 17:02:03  fabiankeil
 #     Fix typo.
 #