nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-28 14:23:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

Browse Source
This commit is contained in:
Nick Mathewson 2011-04-21 13:40:00 -04:00
commit a0514ba531
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
changes/bug2933 Normal file
View File

@ -0,0 +1,4 @@
o Minor bugfixes
- Fix an uncommon assertion failure when running with DNSPort under
heavy load. Fixes bug 2933; bugfix on 2.0.1-alpha.

2
src/or/eventdns.c
View File

@ -1904,7 +1904,7 @@ server_request_free(struct server_request *req)
if (req->port) { if (req->port) {
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;