Mercurial > prosody-hg
comparison net/dns.lua @ 5568:c463558bed45
Merge 0.9->trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Fri, 10 May 2013 10:46:27 +0100 |
| parents | 74ae3e7e8779 |
| children | 6eebd5808fbc 411e9e7d8035 |
comparison
equal
deleted
inserted
replaced
| 5560:cdb057244e44 | 5568:c463558bed45 |
|---|---|
| 1070 | 1070 |
| 1071 function dns.settimeout(...) | 1071 function dns.settimeout(...) |
| 1072 return _resolver:settimeout(...); | 1072 return _resolver:settimeout(...); |
| 1073 end | 1073 end |
| 1074 | 1074 |
| 1075 function dns.cache() | |
| 1076 return _resolver.cache; | |
| 1077 end | |
| 1078 | |
| 1075 function dns.socket_wrapper_set(...) -- - - - - - - - - socket_wrapper_set | 1079 function dns.socket_wrapper_set(...) -- - - - - - - - - socket_wrapper_set |
| 1076 return _resolver:socket_wrapper_set(...); | 1080 return _resolver:socket_wrapper_set(...); |
| 1077 end | 1081 end |
| 1078 | 1082 |
| 1079 return dns; | 1083 return dns; |
