diff options
| author | Kim Alvefur <zash@zash.se> | 2015-09-25 18:03:44 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2015-09-25 18:03:44 +0200 |
| commit | 82e11141e9c48be266f0de78192fdc050e9ed28d (patch) | |
| tree | 1e32c314fb85cbf368bdbedfe0f8eb757cc79d45 /net/dns.lua | |
| parent | 8a539ac1ee9de45326aabefaa124bc7792134521 (diff) | |
| parent | 777da29e5904b91277b087f2ee207545671edf03 (diff) | |
| download | prosody-82e11141e9c48be266f0de78192fdc050e9ed28d.tar.gz prosody-82e11141e9c48be266f0de78192fdc050e9ed28d.zip | |
Merge 0.10->trunk
Diffstat (limited to 'net/dns.lua')
| -rw-r--r-- | net/dns.lua | 2 |
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 |