aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoey Hess <joey@kitenet.net>2011-06-03 12:39:09 -0400
committerJoey Hess <joey@kitenet.net>2011-06-03 12:39:09 -0400
commit3b8fc54717a2c094129278d82f79d36d286718b3 (patch)
tree5e05e7c64c569167416d1ea528513b37ad0550a3
parent50d2704db6fec29756e930d82aecca67802a063e (diff)
downloadikiwiki-3b8fc54717a2c094129278d82f79d36d286718b3.tar
ikiwiki-3b8fc54717a2c094129278d82f79d36d286718b3.tar.gz
merged po4a robustness workaround
-rw-r--r--debian/changelog1
-rw-r--r--doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn6
2 files changed, 7 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index fd23ccd8c..feb4cff81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ ikiwiki (3.20110431) UNRELEASED; urgency=low
* Changed license of madduck's python plugins from GPL-2 to BSD-2-clause.
* po: support language codes in the form of 'es_AR', and 'arn'. (intrigeri)
Closes: #627844
+ * po: Make po4a warn, not error on a malformed document. (intrigeri)
-- Joey Hess <joeyh@debian.org> Thu, 05 May 2011 13:02:19 -0400
diff --git a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
index 20584e4f4..eba59a682 100644
--- a/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
+++ b/doc/bugs/po:_po4a_too_strict_on_html_pages.mdwn
@@ -14,3 +14,9 @@ given ikiwiki site build (DoS) when both the html and po plugins are
enabled: inserting a html tag without closing it is enough.
--[[intrigeri]]
+
+> Hmm, so this happened while I was away at the beach and I have a big
+> backlog of stuff, only saw it now. I've merged the match for master and
+> will be releasing that soon. I will cherry-pick the fix into at least
+> my debian-stable branch too. I don't know if this is worth doing a whole
+> security advisory for. --[[Joey]]