# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1475953632 -7200
# Node ID 861a747e441b7a8160a78797863e840edebe2fca
# Parent  ae24deae64886a00c3bad88d3774e9cc75cf596f# Parent  97c013e8f002f4fecb8e1a67fc2020381f250ccc
Merge 0.10->trunk

diff -r ae24deae6488 -r 861a747e441b Makefile
--- 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
diff -r ae24deae6488 -r 861a747e441b net/server_event.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