Software / code / prosody
Diff
net/server_select.lua @ 5664:4f499eb63c04
Merge 0.9->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 09 Jun 2013 17:03:15 +0200 |
| parent | 5645:ae079d57af2e |
| parent | 5663:4e51ceee469c |
| child | 5776:bd0ff8ae98a8 |
line wrap: on
line diff
--- a/net/server_select.lua Sun Jun 09 12:59:23 2013 +0200 +++ b/net/server_select.lua Sun Jun 09 17:03:15 2013 +0200 @@ -263,7 +263,9 @@ if socket:getfd() >= _maxfd then out_error("server.lua: Disallowed FD number: "..socket:getfd()) -- PROTIP: Switch to libevent socket:close( ) -- Should we send some kind of error here? - server.pause( ) + if server then + server.pause( ) + end return nil, nil, "fd-too-large" end socket:settimeout( 0 )
