From 961f01d6e9cac747e90c9509e64083116fef66cd Mon Sep 17 00:00:00 2001
From: Waqas Hussain <waqas20@gmail.com>
Date: Wed, 2 Jun 2010 17:25:01 +0500
Subject: net.multiplex_listener: Test to make sure listener.onconnect isn't
 nil.

---
 net/multiplex_listener.lua | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/multiplex_listener.lua b/net/multiplex_listener.lua
index dbd7ea13..b515ccce 100644
--- a/net/multiplex_listener.lua
+++ b/net/multiplex_listener.lua
@@ -19,6 +19,8 @@ function server.onincoming(conn, data)
 	if buf:match("^[a-zA-Z]") then
 		local listener = httpserver_listener;
 		conn:setlistener(listener);
+		local onconnect = listener.onconnect;
+		if onconnect then onconnect(conn) end
 		listener.onincoming(conn, buf);
 	elseif buf:match(">") then
 		local listener;
@@ -31,7 +33,8 @@ function server.onincoming(conn, data)
 			listener = xmppclient_listener;
 		end
 		conn:setlistener(listener);
-		listener.onconnect(conn);
+		local onconnect = listener.onconnect;
+		if onconnect then onconnect(conn) end
 		listener.onincoming(conn, buf);
 	elseif #buf > 1024 then
 		conn:close();
-- 
cgit v1.2.3