From: Fabian Keil <fk@fabiankeil.de>
Date: Sat, 20 Feb 2021 04:30:08 +0000 (+0100)
Subject: Make the second pcrs job of the img-reorder filter greedy again
X-Git-Tag: v_3_0_32~46
X-Git-Url: http://www.privoxy.org/gitweb/contact.html?a=commitdiff_plain;h=3ddc05ad1532ae5f5480098ab5595db8a3045694;p=privoxy.git

Make the second pcrs job of the img-reorder filter greedy again

The ungreedy version caused breakage like:
-<img width=888 height=573 src=socket.png>
+<img src=s width=888 height=573ocket.png>
on http://bulk.fefe.de/scalability/.
---

diff --git a/default.filter b/default.filter
index 72c7dcde..e19f6cf6 100644
--- a/default.filter
+++ b/default.filter
@@ -218,7 +218,7 @@ 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|siUg
+s|<img\s+?([^>]*)\ssrc\s*=\s*([^'">\\\s]+)|<img src=$2 $1|sig
 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