diff options
| author | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2013-07-10 07:47:54 +0200 |
| commit | 7cbbf991bc5f48bedaaa39926f524c90660dcd25 (patch) | |
| tree | 906dfdf5f30e7168f5ed66077d09faae6a5a7498 /net/dns.lua | |
| parent | b5ccfb0d7836918c0a65688df2f52e593304d83c (diff) | |
| parent | 5b13d561ee874824d6f4ab70d72307264f22973f (diff) | |
| download | prosody-7cbbf991bc5f48bedaaa39926f524c90660dcd25.tar.gz prosody-7cbbf991bc5f48bedaaa39926f524c90660dcd25.zip | |
Merge 0.9->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 bd42db73..95f09cc9 100644 --- a/net/dns.lua +++ b/net/dns.lua @@ -629,10 +629,10 @@ function resolver:getsocket(servernum) -- - - - - - - - - - - - - getsocket else sock, err = socket.udp(); end + if sock and self.socket_wrapper then sock, err = self.socket_wrapper(sock, self); end if not sock then return nil, err; end - if self.socket_wrapper then sock = self.socket_wrapper(sock, self); end sock:settimeout(0); -- todo: attempt to use a random port, fallback to 0 sock:setsockname('*', 0); |