From 9337b2a991c0a55ff6d3ec6d4ea7601978369cf2 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 8 Oct 2016 14:07:07 +0200 Subject: net.server_event: Restore destruction of socket on read timeout (lost since e67891ad18d6) (thanks Ge0rG) --- net/server_event.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/net/server_event.lua b/net/server_event.lua index 2cb45553..43a19fe9 100644 --- a/net/server_event.lua +++ b/net/server_event.lua @@ -561,6 +561,10 @@ local function handleclient( client, ip, port, server, pattern, listener, sslctx return -1 end if EV_TIMEOUT == event and not interface.conn:dirty() and interface:onreadtimeout() ~= true then + interface.fatalerror = "timeout during receiving" + debug( "connection failed:", interface.fatalerror ) + interface:_close() + interface.eventread = nil return -1 -- took too long to get some data from client -> disconnect end if interface._usingssl then -- handle luasec -- cgit v1.2.3 From 992f00f3781dd4b34aa177376cdd8a459d3020b4 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 8 Oct 2016 21:06:43 +0200 Subject: Makefile: Fix installing modules into their correct subdirectories (thanks mimi89999) --- Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 67730b9f..8b6f99da 100644 --- a/Makefile +++ b/Makefile @@ -46,10 +46,10 @@ install: prosody.install prosodyctl.install prosody.cfg.lua.install util/encodin $(INSTALL_DATA) util/sasl/*.lua $(SOURCE)/util/sasl $(MKDIR) $(MODULES)/mod_s2s $(MODULES)/mod_pubsub $(MODULES)/adhoc $(MODULES)/muc $(INSTALL_DATA) plugins/*.lua $(MODULES) - $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES) - $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES) - $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES) - $(INSTALL_DATA) plugins/muc/*.lua $(MODULES) + $(INSTALL_DATA) plugins/mod_s2s/*.lua $(MODULES)/mod_s2s + $(INSTALL_DATA) plugins/mod_pubsub/*.lua $(MODULES)/mod_pubsub + $(INSTALL_DATA) plugins/adhoc/*.lua $(MODULES)/adhoc + $(INSTALL_DATA) plugins/muc/*.lua $(MODULES)/muc $(INSTALL_DATA) certs/* $(CONFIG)/certs $(INSTALL_DATA) man/prosodyctl.man $(MAN)/man1/prosodyctl.1 test -f $(CONFIG)/prosody.cfg.lua || $(INSTALL_DATA) prosody.cfg.lua.install $(CONFIG)/prosody.cfg.lua -- cgit v1.2.3