diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-07-07 09:56:01 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-07-07 09:56:01 -0400 |
| commit | f883ec09b5b2f48cd4186658e0b92f1511358f21 (patch) | |
| tree | 77d5eacd98fed7a8acc0c0154365ad0f1363b767 | |
| parent | eee942c5bed2d93cd4413c8c2fb13539d5816b69 (diff) | |
| parent | 3ab09763ced6d892cd72956e53f2dfb804ec0a7c (diff) | |
| download | tor-f883ec09b5b2f48cd4186658e0b92f1511358f21.tar tor-f883ec09b5b2f48cd4186658e0b92f1511358f21.tar.gz | |
Merge remote-tracking branch 'origin/maint-0.2.2'
| -rw-r--r-- | changes/bug3536 | 5 | ||||
| -rw-r--r-- | src/or/connection_edge.c | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/changes/bug3536 b/changes/bug3536 new file mode 100644 index 000000000..d3cec131b --- /dev/null +++ b/changes/bug3536 @@ -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. + diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c index 75a93fbb2..c49014848 100644 --- a/src/or/connection_edge.c +++ b/src/or/connection_edge.c @@ -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); } |