summaryrefslogtreecommitdiff
path: root/evdns.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-04-21 13:38:29 -0400
committerNick Mathewson <nickm@torproject.org>2011-04-21 13:38:29 -0400
commit169eca7b58c0031c795b4f443fcccb3cdaac5b98 (patch)
treeb58ecb483579e4abd39c7862c1f7465ab952f9ce /evdns.c
parentd28fc52815023113840fb9e108ada0126964a799 (diff)
parentdde3b7396358392f897aa2215384c839310e8242 (diff)
downloadlibevent-169eca7b58c0031c795b4f443fcccb3cdaac5b98.tar.gz
Merge remote-tracking branch 'origin/patches-2.0'
Diffstat (limited to 'evdns.c')
-rw-r--r--evdns.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/evdns.c b/evdns.c
index ab5dee61..72acefff 100644
--- a/evdns.c
+++ b/evdns.c
@@ -1995,7 +1995,7 @@ server_request_free(struct server_request *req)
EVDNS_LOCK(req->port);
lock=1;
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;
else
req->port->pending_replies = NULL;