diff options
author | Waqas Hussain <waqas20@gmail.com> | 2014-10-08 18:42:33 -0400 |
---|---|---|
committer | Waqas Hussain <waqas20@gmail.com> | 2014-10-08 18:42:33 -0400 |
commit | cff85755634ad9c0ae431245e835625f5c57bb82 (patch) | |
tree | 868af36e940cd3b9d895fa74b3b9c0ab671f166f /util/stanza.lua | |
parent | e4a6b7e39a2f9159ebd9da49771a40ff10474866 (diff) | |
parent | 810491af12c11d96572369816e67282ee4673897 (diff) | |
download | prosody-cff85755634ad9c0ae431245e835625f5c57bb82.tar.gz prosody-cff85755634ad9c0ae431245e835625f5c57bb82.zip |
Merge 0.9->0.10
Diffstat (limited to 'util/stanza.lua')
-rw-r--r-- | util/stanza.lua | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/util/stanza.lua b/util/stanza.lua index 82601e63..3d7caf8c 100644 --- a/util/stanza.lua +++ b/util/stanza.lua @@ -202,8 +202,19 @@ end local xml_escape do - local escape_table = { ["'"] = "'", ["\""] = """, ["<"] = "<", [">"] = ">", ["&"] = "&" }; - function xml_escape(str) return (s_gsub(str, "['&<>\"]", escape_table)); end + 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 _M.xml_escape = xml_escape; end |