diff options
author | Matthew Wild <mwild1@gmail.com> | 2014-10-24 23:20:06 +0100 |
---|---|---|
committer | Matthew Wild <mwild1@gmail.com> | 2014-10-24 23:20:06 +0100 |
commit | d8ae4fa9c91ecfc2ad45d5f214739801ec41b418 (patch) | |
tree | a380bef5ff270fcd48ca80232f2ef098fdb429d0 /util/stanza.lua | |
parent | 30f8b752e65574ce57d0d0a59578fbd4f960e42e (diff) | |
download | prosody-d8ae4fa9c91ecfc2ad45d5f214739801ec41b418.tar.gz prosody-d8ae4fa9c91ecfc2ad45d5f214739801ec41b418.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.vault/0.9.7
Diffstat (limited to 'util/stanza.lua')
-rw-r--r-- | util/stanza.lua | 15 |
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 = { - ["'"] = "'"; - ['"'] = """; - ["<"] = "<"; - [">"] = ">"; - ["&"] = "&"; - -- 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"] = "	"; - ["\n"] = "
"; - ["\r"] = "
"; - }; - function xml_escape(str) return (s_gsub(str, "['&<>\"\t\n\r]", escape_table)); end + local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; + function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end _M.xml_escape = xml_escape; end |