aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-01-05 06:21:31 +0100
committerKim Alvefur <zash@zash.se>2017-01-05 06:21:31 +0100
commit08915348019a37dec48914393de941b77e958f31 (patch)
treedf1b4f86508f3d39e4c17f6b1d8f979139507703
parent56a3538054ec1dc3f39f314d4059abc31d25b0d7 (diff)
downloadprosody-08915348019a37dec48914393de941b77e958f31.tar.gz
prosody-08915348019a37dec48914393de941b77e958f31.zip
net.server_epoll: Fix traceback if wrapclient called without a pattern or parent server
-rw-r--r--net/server_epoll.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/server_epoll.lua b/net/server_epoll.lua
index 7a62b03c..0f340560 100644
--- a/net/server_epoll.lua
+++ b/net/server_epoll.lua
@@ -472,7 +472,7 @@ local function wrapsocket(client, server, pattern, listeners, tls) -- luasocket
server = server;
created = gettime();
listeners = listeners;
- _pattern = pattern or server._pattern;
+ _pattern = pattern or (server and server._pattern);
writebuffer = {};
tls = tls;
}, interface_mt);