aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2021-01-12 19:19:15 +0100
committerKim Alvefur <zash@zash.se>2021-01-12 19:19:15 +0100
commitf79bfc4c4570c7e267a0e4654baaa1ac73c0287b (patch)
tree997cb2d8bce39f14c53cffc37d43c8a3715f81c5
parentf4dd4dd8b8318818724bd04b5ce47197e63f441a (diff)
parent2c0cf4646c863438f86af4348a01136346236860 (diff)
downloadprosody-f79bfc4c4570c7e267a0e4654baaa1ac73c0287b.tar.gz
prosody-f79bfc4c4570c7e267a0e4654baaa1ac73c0287b.zip
Merge 0.11->trunk
-rw-r--r--net/adns.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/net/adns.lua b/net/adns.lua
index 48b724c0..ae168b9c 100644
--- a/net/adns.lua
+++ b/net/adns.lua
@@ -56,6 +56,11 @@ local function new_async_socket(sock, resolver)
return nil, err;
end
end
+ if handler.set then
+ -- server_epoll: only watch for incoming data
+ -- avoids sending empty packet on first 'onwritable' event
+ handler:set(true, false);
+ end
handler.settimeout = function () end
handler.setsockname = function (_, ...) return sock:setsockname(...); end