Consistently use the U(ngreedy) flag in the 'img-reorder' filter

[privoxy.git] / default.filter

diff --git a/default.filter b/default.filter
index 9815fea..ea826f2 100644 (file)
--- a/default.filter
+++ b/default.filter
@@ -2,12 +2,12 @@
 # 
 #  File        :  $Source: /cvsroot/ijbswa/current/default.filter,v $
 # 
-#  $Id: default.filter,v 1.92 2014/10/17 14:45:10 fabiankeil Exp $
+#  $Id: default.filter,v 1.94 2016/05/25 10:51:41 fabiankeil Exp $
 #
 #  Purpose     :  Rules to process the content of web pages
 # 
 #  Copyright   :  Written by and Copyright (C) 2001-2014 the
-#                 Privoxy team. http://www.privoxy.org/
+#                 Privoxy team. https://www.privoxy.org/
 #
 #                 This program is free software; you can redistribute it
 #                 and/or modify it under the terms of the GNU General
@@ -221,8 +221,8 @@ FILTER: img-reorder Reorder attributes in <img> tags to make the banners-by-* fi
 # and banners-by-link to preserve the original image URL in the title attribute.
 
 s|<img\s+?([^>]*)\ssrc\s*=\s*(['"])([^>'" ]+)\2|<img src=$2$3$2 $1|siUg
-s|<img\s+?([^>]*)\ssrc\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
-s|(<img[^>]+height)\s*=\s*|$1=|sig
+s|<img\s+?([^>]*)\ssrc\s*=\s*([^'">\\\s]+)|<img src=$2 $1|siUg
+s|(<img[^>]+height)\s*=\s*|$1=|siUg
 
 s|<img (src=(?:(['"])[^>'" ]*\2\|[^'">\\\s]+?))([^>]*)\s+width\s*=\s*((["']?)\d+?\5)(?=[\s>])|<img $1 width=$4$3|siUg
 
@@ -813,6 +813,16 @@ CLIENT-HEADER-TAGGER: client-ip-address Tags the request with the client's IP ad
 
 s@^\w*\s+.*\s+HTTP/\d\.\d\s*@IP-ADDRESS: $origin@D
 
+#################################################################################
+#
+# listen-address: Tags the request with the listen-address on which the request
+#                 came in.
+#
+#################################################################################
+CLIENT-HEADER-TAGGER: listen-address Tags the request with the listen-address on which the request came in.
+
+s@^\w*\s+.*\s+HTTP/\d\.\d\s*@LISTEN-ADDRESS: $listen-address@D
+
 #################################################################################
 #
 # http-method: Tags the request with its HTTP method.