Software / code / prosody
Changeset
7803:4d182b9a8109
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 02 Jan 2017 03:06:51 +0100 |
| parents | 7800:dadf9ba290c5 (current diff) 7802:802dc0691177 (diff) |
| children | 7808:0494bf73dfee |
| files | prosody |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/core/stanza_router.lua Sun Jan 01 19:42:12 2017 +0100 +++ b/core/stanza_router.lua Mon Jan 02 03:06:51 2017 +0100 @@ -74,7 +74,7 @@ origin.send(st.error_reply(stanza, "modify", "bad-request", "Missing required 'id' attribute")); return; elseif (st_type == "set" or st_type == "get") and (#stanza.tags ~= 1) then - origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanz")); + origin.send(st.error_reply(stanza, "modify", "bad-request", "Incorrect number of children for IQ stanza")); return; end end
--- a/prosody Sun Jan 01 19:42:12 2017 +0100 +++ b/prosody Mon Jan 02 03:06:51 2017 +0100 @@ -95,7 +95,7 @@ print("\n"); print("**************************"); if level == "parser" then - print("A problem occured while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":"); + print("A problem occurred while reading the config file "..(CFG_CONFIGDIR or ".").."/prosody.cfg.lua"..":"); print(""); local err_line, err_message = tostring(err):match("%[string .-%]:(%d*): (.*)"); if err:match("chunk has too many syntax levels$") then
