aboutsummaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
committerKim Alvefur <zash@zash.se>2016-01-16 22:44:43 +0100
commit48f8c23f4ab0e8400e20101960055eb29c4aa6f7 (patch)
treebde7b68581a288e5d3fc8a036c80502296972394 /net
parent69f9998d1641846399e3d2818da4fd07ae05739a (diff)
parent83e7c91e0130f27720406b87996c4c74b7cc0afe (diff)
downloadprosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.tar.gz
prosody-48f8c23f4ab0e8400e20101960055eb29c4aa6f7.zip
Merge 0.10->trunk
Diffstat (limited to 'net')
-rw-r--r--net/http/server.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/http/server.lua b/net/http/server.lua
index 9649d0e8..aeaa7416 100644
--- a/net/http/server.lua
+++ b/net/http/server.lua
@@ -294,7 +294,7 @@ function _M.remove_handler(event, handler)
end
function _M.listen_on(port, interface, ssl)
- addserver(interface or "*", port, listener, "*a", ssl);
+ return addserver(interface or "*", port, listener, "*a", ssl);
end
function _M.add_host(host)
hosts[host] = true;