diff options
| author | Kim Alvefur <zash@zash.se> | 2016-10-08 21:07:12 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-10-08 21:07:12 +0200 |
| commit | de36c063b3efe67350888cd8334c7c17a1acd439 (patch) | |
| tree | 5fe55261102b6924bf57aac6168934e490359956 | |
| parent | 15c519eb2fa4ab7a704f2f3817c41233e78c7624 (diff) | |
| parent | 3dd1ce8680d7831d2934013850067c5141069adb (diff) | |
| download | prosody-de36c063b3efe67350888cd8334c7c17a1acd439.tar.gz prosody-de36c063b3efe67350888cd8334c7c17a1acd439.zip | |
Merge 0.10->trunk
| -rw-r--r-- | Makefile | 8 | ||||
| -rw-r--r-- | net/server_event.lua | 4 |
2 files changed, 8 insertions, 4 deletions
@@ -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 diff --git a/net/server_event.lua b/net/server_event.lua index c10173e4..fc3bde9f 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 |