projects
/
prosody.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
155f871
)
net.server_select: Make sure there is a server to pause when hitting maxfd (Thanks...
author
Kim Alvefur
<zash@zash.se>
Sun, 9 Jun 2013 15:00:26 +0000
(17:00 +0200)
committer
Kim Alvefur
<zash@zash.se>
Sun, 9 Jun 2013 15:00:26 +0000
(17:00 +0200)
net/server_select.lua
patch
|
blob
|
history
diff --git
a/net/server_select.lua
b/net/server_select.lua
index a6e91d0b2921582cf267bd165c3d6950fdea4d9a..d08947159df2c03bbab51522f4b87a632e57e807 100644
(file)
--- a/
net/server_select.lua
+++ b/
net/server_select.lua
@@
-263,7
+263,9
@@
wrapconnection = function( server, listeners, socket, ip, serverport, clientport
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 )