aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2010-03-01 18:46:37 +0000
committerMatthew Wild <mwild1@gmail.com>2010-03-01 18:46:37 +0000
commit52817c55177ca4ad795705a89d1d8a1a40e9688b (patch)
tree134101e1dd0b72864b26adbed0b3d159d59d54bc /net
parent8db085eb2976736ab1ef118b203d2832c3107334 (diff)
downloadprosody-52817c55177ca4ad795705a89d1d8a1a40e9688b.tar.gz
prosody-52817c55177ca4ad795705a89d1d8a1a40e9688b.zip
net.server_event: Fix some global accesses
Diffstat (limited to 'net')
-rw-r--r--net/server_event.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/net/server_event.lua b/net/server_event.lua
index 70435f38..b767cb20 100644
--- a/net/server_event.lua
+++ b/net/server_event.lua
@@ -543,7 +543,7 @@ do
local callback = function( )
interface:_close()
interface.eventwritetimeout = nil
- return evreturn, evtimeout
+ return -1;
end
interface.eventwritetimeout = addevent( base, nil, EV_TIMEOUT, callback, cfg.WRITE_TIMEOUT ) -- reg a new timeout event
debug( "wantread during write attemp, reg it in readcallback but dont know what really happens next..." )
@@ -762,7 +762,7 @@ do
local server = function( )
return nil, "this is a dummy server interface"
end
- local interface = wrapclient( client, ip, serverport, listeners, pattern, sslctx, startssl )
+ local interface = wrapclient( client, ip, serverport, listener, pattern, sslctx, startssl )
interface:_start_connection( startssl )
debug( "new connection id:", interface.id )
return interface, err