Merge 0.10->trunk

1 files changed, 3 insertions, 1 deletions

diff --git a/prosody b/prosody
index 61be6c2e..47998583 100755
--- a/prosody
+++ b/prosody
@@ -372,8 +372,10 @@ function loop()
 		prosody.events.fire_event("very-bad-error", {error = err, traceback = traceback});
 	end
 	
+	local sleep = require"socket".sleep;
+
 	while select(2, xpcall(server.loop, catch_uncaught_error)) ~= "quitting" do
-		socket.sleep(0.2);
+		sleep(0.2);
 	end
 end