aboutsummaryrefslogtreecommitdiffstats
path: root/net/dns.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2015-09-25 18:03:44 +0200
committerKim Alvefur <zash@zash.se>2015-09-25 18:03:44 +0200
commit9693f85d1b1078c49e49b172f7f3426bb1cb68a3 (patch)
tree1e32c314fb85cbf368bdbedfe0f8eb757cc79d45 /net/dns.lua
parentb415f80bd6a623b351126d86deb4734984b7e32b (diff)
parente80179ba6e0ca23afc13fa2c723dbd5815bab5a5 (diff)
downloadprosody-9693f85d1b1078c49e49b172f7f3426bb1cb68a3.tar.gz
prosody-9693f85d1b1078c49e49b172f7f3426bb1cb68a3.zip
Merge 0.10->trunk
Diffstat (limited to 'net/dns.lua')
-rw-r--r--net/dns.lua2
1 files changed, 1 insertions, 1 deletions
diff --git a/net/dns.lua b/net/dns.lua
index acc1556c..80bd895c 100644
--- a/net/dns.lua
+++ b/net/dns.lua
@@ -620,7 +620,7 @@ function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket
if peer:find(":") then
sock, err = socket.udp6();
else
- sock, err = socket.udp();
+ sock, err = (socket.udp4 or socket.udp)();
end
if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end
if not sock then