aboutsummaryrefslogtreecommitdiffstats
path: root/util
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2014-10-24 23:20:06 +0100
committerMatthew Wild <mwild1@gmail.com>2014-10-24 23:20:06 +0100
commit886aa3c20ac5c407fe07ca6abe3d64fa48ab471b (patch)
treea380bef5ff270fcd48ca80232f2ef098fdb429d0 /util
parent5daa7d93876b46d4bbb0d8d2486351e0b2d8da5f (diff)
downloadprosody-886aa3c20ac5c407fe07ca6abe3d64fa48ab471b.tar.gz
prosody-886aa3c20ac5c407fe07ca6abe3d64fa48ab471b.zip
Backout changeset 6e67c73f730c: not a major fix and it breaks interop with at least Isode M-Link, and possibly standards, while it's not clear it actually fixes the original problem either.0.9.7
Diffstat (limited to 'util')
-rw-r--r--util/stanza.lua15
1 files changed, 2 insertions, 13 deletions
diff --git a/util/stanza.lua b/util/stanza.lua
index 2fcf2c79..7c214210 100644
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -202,19 +202,8 @@ end
local xml_escape
do
- local escape_table = {
- ["'"] = "&apos;";
- ['"'] = "&quot;";
- ["<"] = "&lt;";
- [">"] = "&gt;";
- ["&"] = "&amp;";
- -- escape this whitespace because [\r\n\t] change into spaces in attributes
- -- and \r\n changes into \n in text, and we want to preserve original bytes
- ["\t"] = "&#x9;";
- ["\n"] = "&#xA;";
- ["\r"] = "&#xD;";
- };
- function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end
+ local escape_table = { ["'"] = "&apos;", ["\""] = "&quot;", ["<"] = "&lt;", [">"] = "&gt;", ["&"] = "&amp;" };
+ function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end
_M.xml_escape = xml_escape;
end