From 0a2515bd97a9ad87d27104e82e98bb3ad56905eb Mon Sep 17 00:00:00 2001 From: Matthew Wild Date: Thu, 11 Feb 2010 21:09:59 +0000 Subject: net.server_select: Fix traceback with no LuaSec available (thanks Nolan) --- net/server_select.lua | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'net/server_select.lua') diff --git a/net/server_select.lua b/net/server_select.lua index db4475e2..e3619d30 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -55,8 +55,8 @@ local coroutine_yield = coroutine.yield --// extern libs //-- -local luasec = select( 2, pcall( require, "ssl" ) ) -local luasocket = require "socket" +local luasec = use "ssl" +local luasocket = use "socket" or require "socket" --// extern lib methods //-- @@ -601,8 +601,10 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport handler.readbuffer = _readbuffer handler.sendbuffer = _sendbuffer end + else + handler.readbuffer = _readbuffer + handler.sendbuffer = _sendbuffer end - send = socket.send receive = socket.receive shutdown = ( ssl and id ) or socket.shutdown -- cgit v1.2.3