aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--net/http/server.lua2
-rw-r--r--plugins/mod_c2s.lua11
-rw-r--r--plugins/mod_s2s/mod_s2s.lua2
-rw-r--r--util-src/table.c3
4 files changed, 11 insertions, 7 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index bc39767f..ba45ede0 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -13,7 +13,7 @@ local traceback = debug.traceback;
local tostring = tostring;
local cache = require "util.cache";
local codes = require "net.http.codes";
-local blocksize = require "socket".BLOCKSIZE or 2048;
+local blocksize = 2^16;
local _M = {};
diff --git a/plugins/mod_c2s.lua b/plugins/mod_c2s.lua
index 703c4ac7..18375248 100644
--- a/plugins/mod_c2s.lua
+++ b/plugins/mod_c2s.lua
@@ -261,9 +261,9 @@ function listener.onconnect(conn)
function session.data(data)
-- Parse the data, which will store stanzas in session.pending_stanzas
if data then
- data = filter("bytes/in", data);
- if data then
- local ok, err = stream:feed(data);
+ data = filter("bytes/in", data);
+ if data then
+ local ok, err = stream:feed(data);
if not ok then
log("debug", "Received invalid XML (%s) %d bytes: %s", tostring(err), #data, data:sub(1, 300):gsub("[\r\n]+", " "):gsub("[%z\1-\31]", "_"));
session:close("not-well-formed");
@@ -309,7 +309,10 @@ function listener.onreadtimeout(conn)
end
local function keepalive(event)
- return event.session.send(' ');
+ local session = event.session;
+ if not session.notopen then
+ return event.session.send(' ');
+ end
end
function listener.associate_session(conn, session)
diff --git a/plugins/mod_s2s/mod_s2s.lua b/plugins/mod_s2s/mod_s2s.lua
index fe674b55..a6fdd254 100644
--- a/plugins/mod_s2s/mod_s2s.lua
+++ b/plugins/mod_s2s/mod_s2s.lua
@@ -673,8 +673,8 @@ end
function listener.onreadtimeout(conn)
local session = sessions[conn];
- local host = session.host or session.to_host;
if session then
+ local host = session.host or session.to_host;
return (hosts[host] or prosody).events.fire_event("s2s-read-timeout", { session = session });
end
end
diff --git a/util-src/table.c b/util-src/table.c
index 423f8f29..63415541 100644
--- a/util-src/table.c
+++ b/util-src/table.c
@@ -7,10 +7,11 @@ static int Lcreate_table(lua_State* L) {
}
static int Lpack(lua_State* L) {
+ int arg;
unsigned int n_args = lua_gettop(L);
lua_createtable(L, n_args, 1);
lua_insert(L, 1);
- for(int arg = n_args; arg >= 1; arg--) {
+ for(arg = n_args; arg >= 1; arg--) {
lua_rawseti(L, 1, arg);
}
lua_pushinteger(L, n_args);