Mercurial > prosody-hg
comparison net/adns.lua @ 6289:a29cc79295e6
Merge 0.9->0.10
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Mon, 30 Jun 2014 13:11:01 +0200 |
| parents | bd0ff8ae98a8 a380b09649e6 |
| children | 8273236a995f |
comparison
equal
deleted
inserted
replaced
| 6284:b49540983320 | 6289:a29cc79295e6 |
|---|---|
| 50 | 50 |
| 51 function new_async_socket(sock, resolver) | 51 function new_async_socket(sock, resolver) |
| 52 local peername = "<unknown>"; | 52 local peername = "<unknown>"; |
| 53 local listener = {}; | 53 local listener = {}; |
| 54 local handler = {}; | 54 local handler = {}; |
| 55 local err; | |
| 55 function listener.onincoming(conn, data) | 56 function listener.onincoming(conn, data) |
| 56 if data then | 57 if data then |
| 57 dns.feed(handler, data); | 58 dns.feed(handler, data); |
| 58 end | 59 end |
| 59 end | 60 end |
