diff options
| author | Matthew Wild <mwild1@gmail.com> | 2010-03-01 21:03:17 +0000 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2010-03-01 21:03:17 +0000 |
| commit | 651f61921bc5a867fdba3337ae7541fa4feccf7d (patch) | |
| tree | 267bb4e32e4655ad6bac8cbda16e04ebebc48859 /net | |
| parent | 2f5a9cd4ede54690f4fd1633ab201add613a5645 (diff) | |
| parent | 29e84d0af11fad1c6091340978065b7586193228 (diff) | |
| download | prosody-651f61921bc5a867fdba3337ae7541fa4feccf7d.tar.gz prosody-651f61921bc5a867fdba3337ae7541fa4feccf7d.zip | |
Merge with 0.7
Diffstat (limited to 'net')
| -rw-r--r-- | net/server_event.lua | 4 | ||||
| -rw-r--r-- | net/server_select.lua | 2 |
2 files changed, 3 insertions, 3 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 diff --git a/net/server_select.lua b/net/server_select.lua index ca8b1113..c4a1f19a 100644 --- a/net/server_select.lua +++ b/net/server_select.lua @@ -472,7 +472,7 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport _sendlistlen = removesocket( _sendlist, socket, _sendlistlen ) -- delete socket from writelist _ = needtls and handler:starttls(nil, true) _writetimes[ handler ] = nil - _ = toclose and handlerclose( ) + _ = toclose and handler:close( ) return true elseif byte and ( err == "timeout" or err == "wantwrite" ) then -- want write buffer = string_sub( buffer, byte + 1, bufferlen ) -- new buffer |