Merge branch 'master' into warn-ssl3

pull/319/head
Tatsuhiro Tsujikawa 2014-12-15 23:44:41 +09:00
commit 701e5df790
1 changed files with 4 additions and 3 deletions

View File

@ -159,9 +159,10 @@ void LibuvEventPoll::poll(const struct timeval& tv)
// their API. So we call ares_process_fd for all ares_channel and
// re-register their sockets.
for (auto& r: nameResolverEntries_) {
r->processTimeout();
r->removeSocketEvents(this);
r->addSocketEvents(this);
auto& ent = r.second;
ent.processTimeout();
ent.removeSocketEvents(this);
ent.addSocketEvents(this);
}
#endif // ENABLE_ASYNC_DNS