From a1afce4f21bbcdc2c5bcc2677ba76c02c2ec7f3b Mon Sep 17 00:00:00 2001 From: Fabian Keil Date: Sun, 8 Oct 2006 17:00:51 +0000 Subject: [PATCH] Modified webbugs filter to create a comment around the offending image instead of removing it entirely. Adjusted regex to only match if there's at least one whitespace before the width and height attributes. Makes it more likely that they are indeed attributes, and not part of the value of another attribute. Solves BR 1035587. Thanks to Martin Thomas for diagnosing the cause of the problem. --- default.filter | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/default.filter b/default.filter index 6e3ba79d..68fe5439 100644 --- a/default.filter +++ b/default.filter @@ -2,7 +2,7 @@ # # File : $Source: /cvsroot/ijbswa/current/default.filter,v $ # -# $Id: default.filter,v 1.25 2006/10/06 15:26:09 fabiankeil Exp $ +# $Id: default.filter,v 1.26 2006/10/06 18:06:16 fabiankeil Exp $ # # Purpose : Rules to process the content of web pages # @@ -282,7 +282,8 @@ s@\1\s]*?(?:adclick|atwola\.com/(?:link|redir)|double ################################################################################# FILTER: webbugs Squish WebBugs (1x1 invisible GIFs used for user tracking) -s/]*(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*?>//siUg +s@]*\s(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*\s(?:width|height)\s*=\s*['"]?[01](?=\D)[^>]*?>@@siUg ################################################################################# @@ -602,6 +603,11 @@ s@^(Content-Type:) (?:application|text)/(?:xhtml\+)?xml(;.*)?$@$1 text/html$2@ # # Revisions : # $Log: default.filter,v $ +# Revision 1.26 2006/10/06 18:06:16 fabiankeil +# Added header filter x-httpd-php-to-html +# and reverted another img-reorder whitespace +# problem. +# # Revision 1.25 2006/10/06 15:26:09 fabiankeil # Bumped copyright year. # -- 2.49.0