Mercurial > lxmppd-hg-xmllex / file diff

--- a/net/server.lua	Sun Nov 22 13:47:24 2009 +0000
+++ b/net/server.lua	Sun Nov 22 14:42:56 2009 +0000
@@ -5,6 +5,9 @@
 
 if have_luaevent and use_luaevent == true then
 	server = require "net.server_event";
+	-- util.timer requires "net.server", so instead of having
+	-- Lua look for, and load us again (causing a loop) - set this here
+	-- (usually it isn't set until we return, look down there...)
 	package.loaded["net.server"] = server;
 	
 	-- Backwards compatibility for timers, addtimer
@@ -18,4 +21,6 @@
 	package.loaded["net.server"] = server;
 end
 
-return server;
+-- require "net.server" shall now forever return this,
+-- ie. server_select or server_event as chosen above.
+return server;