Software / code / prosody
Changeset
7690:861a747e441b
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sat, 08 Oct 2016 21:07:12 +0200 |
| parents | 7687:ae24deae6488 (current diff) 7689:97c013e8f002 (diff) |
| children | 7691:a5ad858f3a93 |
| files | net/server_event.lua |
| diffstat | 2 files changed, 8 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/Makefile Fri Oct 07 17:18:29 2016 +0200 +++ b/Makefile Sat Oct 08 21:07:12 2016 +0200 @@ -46,10 +46,10 @@ $(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
--- a/net/server_event.lua Fri Oct 07 17:18:29 2016 +0200 +++ b/net/server_event.lua Sat Oct 08 21:07:12 2016 +0200 @@ -561,6 +561,10 @@ 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
