Merge branch 'master' of ssh://git.kitenet.net/srv/git/ikiwiki.info

diff --git a/IkiWiki/Plugin/htmlscrubber.pm b/IkiWiki/Plugin/htmlscrubber.pm
index 8c37f1be618b612c68bab5350077d341668be4d6..8804daf56985fd458ddfb4f598c5c6364cf69443 100644 (file)
--- a/IkiWiki/Plugin/htmlscrubber.pm
+++ b/IkiWiki/Plugin/htmlscrubber.pm
@@ -22,12 +22,12 @@ 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",
                "msnim", "notes", "rsync", "secondlife", "skype", "ssh",
-               "sftp", "sms", "steam", "webcal", "ymsgr",
+               "sftp", "sms", "webcal", "ymsgr",
        );
        # data is a special case. Allow data:image/*, but
        # disallow data:text/javascript and everything else.

diff --git a/debian/changelog b/debian/changelog
index 719150ee6daab7e8d9ce88fe1ed08a8c48c53821..1a43344a492ebe36bc861a311256ebf840a7cc74 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,7 +23,12 @@ 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.
+  * Do not allow the steam: URI scheme.
+
+ -- Josh Triplett <josh@freedesktop.org>  Sun, 10 Feb 2008 14:48:48 -0800
 
 ikiwiki (2.31.2) unstable; urgency=high