diff options
| -rw-r--r-- | IkiWiki/Plugin/htmlscrubber.pm | 2 | ||||
| -rw-r--r-- | debian/changelog | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm index 26e18ffc7..9f40c752f 100644 --- a/IkiWiki/Plugin/htmlscrubber.pm +++ b/IkiWiki/Plugin/htmlscrubber.pm @@ -32,7 +32,7 @@ sub import { ); # data is a special case. Allow a few data:image/ types, # but disallow data:text/javascript and everything else. - $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|\/))/i; + $safe_url_regexp=qr/^(?:(?:$uri_schemes):|data:image\/(?:png|jpeg|gif)|[^:]+(?:$|[\/\?]))/i; } sub getsetup () { diff --git a/debian/changelog b/debian/changelog index bbca7cffe..adf0dfed6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ ikiwiki (3.20100324) UNRELEASED; urgency=low used, but they are available in the session object now.) * page.tmpl: Add Cache-Control must-revalidate to ensure that users (especially of Firefox) see fresh page content. + * htmlscrubber: Allow colons in urls after '?' -- Joey Hess <joeyh@debian.org> Sat, 13 Mar 2010 14:48:10 -0500 |