Merge branch '20_evdns_circular_list_patch' into patches-2.0

This commit is contained in:
Nick Mathewson 2011-04-21 13:30:22 -04:00
commit dde3b73963

View File

@ -1993,7 +1993,7 @@ server_request_free(struct server_request *req)
EVDNS_LOCK(req->port); EVDNS_LOCK(req->port);
lock=1; lock=1;
if (req->port->pending_replies == req) { if (req->port->pending_replies == req) {
if (req->next_pending) if (req->next_pending && req->next_pending != req)
req->port->pending_replies = req->next_pending; req->port->pending_replies = req->next_pending;
else else
req->port->pending_replies = NULL; req->port->pending_replies = NULL;