aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-02 03:06:51 +0100
committerKim Alvefur <zash@zash.se>2017-01-02 03:06:51 +0100
commit5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4 (patch)
tree86cb32a5b72a214dbd7cf37ee7ae89b5c03de5be
parent31116c6f6ccfa91b67c01b14408e6961cdfb6960 (diff)
parent0516532553fea667f2f96145ed93eac85ee9135c (diff)
downloadprosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.tar.gz
prosody-5e7ee9e5130e7c9e08e3db87f31a7e99a56767e4.zip
Merge 0.10->trunk
-rw-r--r--core/stanza_router.lua2
-rwxr-xr-xprosody2
2 files changed, 2 insertions, 2 deletions
diff --git a/core/stanza_router.lua b/core/stanza_router.lua
index 98952faf..228fed80 100644
--- a/core/stanza_router.lua
+++ b/core/stanza_router.lua
@@ -74,7 +74,7 @@ function core_process_stanza(origin, stanza)
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
diff --git a/prosody b/prosody
index fb20bc49..f8e0a4d2 100755
--- a/prosody
+++ b/prosody
@@ -95,7 +95,7 @@ function read_config()
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