Software / code / prosody
Diff
net/server_event.lua @ 2731:373a7c960409
net.server_event: Fix some global accesses
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Mon, 01 Mar 2010 18:46:37 +0000 |
| parent | 2726:1b9179e04233 |
| child | 2939:dc73cbc69bd5 |
line wrap: on
line diff
--- a/net/server_event.lua Mon Mar 01 18:07:37 2010 +0000 +++ b/net/server_event.lua Mon Mar 01 18:46:37 2010 +0000 @@ -543,7 +543,7 @@ 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 @@ 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
