summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJosh Triplett <josh@freedesktop.org>2008-02-10 14:50:04 -0800
committerJosh Triplett <josh@freedesktop.org>2008-02-10 14:50:30 -0800
commit3cda22a27fafc5cdfdd32ddc0644242f61410ce7 (patch)
treef31adec9875542031ae60d41e6e657489046fc31
parent14414fcd92f9e3c4f7b81ee3608fae7357153b78 (diff)
Match literal '.' in URI schemas containing '.', rather than matching any character
-rw-r--r--IkiWiki/Plugin/htmlscrubber.pm2
-rw-r--r--debian/changelog6
2 files changed, 6 insertions, 2 deletions
diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 8c37f1be6..53d4635d5 100644
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -22,7 +22,7 @@ sub import { #{{{
"dav", "dict", "dns", "fax", "go", "h323", "im", "imap",
"ldap", "mid", "news", "nfs", "nntp", "pop", "pres",
"sip", "sips", "snmp", "tel", "urn", "wais", "xmpp",
- "z39.50r", "z39.50s",
+ "z39\.50r", "z39\.50s",
# Selected unofficial schemes
"aim", "callto", "cvs", "ed2k", "feed", "fish", "gg",
"irc", "ircs", "lastfm", "ldaps", "magnet", "mms",
diff --git a/debian/changelog b/debian/changelog
index 719150ee6..8b6c82568 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,11 @@ ikiwiki (2.31.3) unstable; urgency=high
* meta: Check that the urls provided for authorurl, permalink, and openid
are safe and can't contain javascript.
- -- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 13:59:00 -0800
+ [ Josh Triplett ]
+ * Match literal '.' in URI schemas containing '.', rather than matching any
+ character.
+
+ -- Josh Triplett <josh@freedesktop.org> Sun, 10 Feb 2008 14:48:48 -0800
ikiwiki (2.31.2) unstable; urgency=high