Software / code / prosody
Diff
net/server_event.lua @ 6286:ec6e8d5a3fd3
net/server_*: Fix addclient: LuaSocket 3.0-rc1 sometimes returns EALREADY instead of EINPROGRESS when the dns lookup has multiple results
| author | daurnimator <quae@daurnimator.com> |
|---|---|
| date | Wed, 25 Jun 2014 12:15:00 -0400 |
| parent | 6055:596539a30e9b |
| child | 6316:e144a1b67c30 |
line wrap: on
line diff
--- a/net/server_event.lua Sat Jun 21 15:05:52 2014 +0200 +++ b/net/server_event.lua Wed Jun 25 12:15:00 2014 -0400 @@ -761,7 +761,7 @@ end client:settimeout( 0 ) -- set nonblocking local res, err = client:connect( addr, serverport ) -- connect - if res or ( err == "timeout" ) then + if res or ( err == "timeout" or err == "Operation already in progress" ) then if client.getsockname then addr = client:getsockname( ) end