aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
committerKim Alvefur <zash@zash.se>2016-01-10 03:57:17 +0100
commit1df83ddc8cdb6a93f4b736f461cec71084bbf095 (patch)
tree64202f4daef595ff51640c1810fbb2751775faa4 /net
parent8cdd08825d3ab4afddc12ddf75dc9af1924e8518 (diff)
parent0d98ccd02a37153aef1cbfb71ba9c103d43fbda7 (diff)
downloadprosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.tar.gz
prosody-1df83ddc8cdb6a93f4b736f461cec71084bbf095.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/server_select.lua3
1 files changed, 3 insertions, 0 deletions
diff --git a/net/server_select.lua b/net/server_select.lua
index 4df6e12d..c89747bb 100644
--- a/net/server_select.lua
+++ b/net/server_select.lua
@@ -391,6 +391,9 @@ wrapconnection = function( server, listeners, socket, ip, serverport, clientport
out_put "server.lua: closed client handler and removed socket from list"
return true
end
+ handler.server = function ( )
+ return server
+ end
handler.ip = function( )
return ip
end