Merge remote-tracking branch 'origin/patches-2.0'

This commit is contained in:
Nick Mathewson 2012-02-01 14:57:44 -05:00
commit 032aac156c

View File

@ -169,6 +169,7 @@ struct request {
struct nameserver *ns; /* the server which we last sent it */ struct nameserver *ns; /* the server which we last sent it */
/* these objects are kept in a circular list */ /* these objects are kept in a circular list */
/* XXX We could turn this into a CIRCLEQ. */
struct request *next, *prev; struct request *next, *prev;
struct event timeout_event; struct event timeout_event;
@ -2474,9 +2475,7 @@ _evdns_nameserver_add_impl(struct evdns_base *base, const struct sockaddr *addre
ns->next = base->server_head->next; ns->next = base->server_head->next;
ns->prev = base->server_head; ns->prev = base->server_head;
base->server_head->next = ns; base->server_head->next = ns;
if (base->server_head->prev == base->server_head) { ns->next->prev = ns;
base->server_head->prev = ns;
}
} }
base->global_good_nameservers++; base->global_good_nameservers++;