torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nick Mathewson
2011-07-07 09:56:01 -04:00
parent eee942c5be 3ab09763ce
commit f883ec09b5
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
changes/bug3536
+5
View File
@@ -0,0 +1,5 @@
o Minor bugfixes:
- Send a SUCCEEDED stream event to the controller when a reverse
resolve succeeded. Fixes bug 3536; bugfix on 0.0.8pre1. Issue
discovered by katmagic.
src/or/connection_edge.c
+2 -1
View File
@@ -2620,7 +2620,8 @@ connection_ap_handshake_socks_resolved(edge_connection_t *conn,
}
connection_ap_handshake_socks_reply(conn, buf, replylen,
(answer_type == RESOLVED_TYPE_IPV4 ||
answer_type == RESOLVED_TYPE_IPV6) ?
answer_type == RESOLVED_TYPE_IPV6 ||
answer_type == RESOLVED_TYPE_HOSTNAME) ?
0 : END_STREAM_REASON_RESOLVEFAILED);
}