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
commit0f30c79999e4572c62f8f5bdfd29771b746db8d3 (patch)
tree64202f4daef595ff51640c1810fbb2751775faa4 /net
parentfb972a1ea95f574ecacd7a213a04c4cab5e41f56 (diff)
parent596cd6813cca26de9864a92650b04aa90d4af3c3 (diff)
downloadprosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.tar.gz
prosody-0f30c79999e4572c62f8f5bdfd29771b746db8d3.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