summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2005-05-21 00:15:23 +0000
committerRoger Dingledine <arma@torproject.org>2005-05-21 00:15:23 +0000
commitb86716b839d2ba18c0e977a5d49fef770e26d613 (patch)
treebe2d68d20f5d5d15b51cf4166e22fee9952fbb51
parentd22c141659b49358858cbbd18294d11bcc4dcfb3 (diff)
downloadtor-b86716b839d2ba18c0e977a5d49fef770e26d613.tar.gz
tor-b86716b839d2ba18c0e977a5d49fef770e26d613.zip
If a socks connection ends because read fails, don't warn that you're
not sending a socks reply back. (bug reported by Warren Barrow) svn:r4277
-rw-r--r--src/or/connection.c2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/or/connection.c b/src/or/connection.c
index 7ecff7ba15..95912072b4 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -996,6 +996,8 @@ loop_again:
connection_close_immediate(conn); /* Don't flush; connection is dead. */
if (CONN_IS_EDGE(conn)) {
connection_edge_end_errno(conn, conn->cpath_layer);
+ if (conn->socks_request) /* broken, so don't send a socks reply back */
+ conn->socks_request->has_finished = 1;
}
connection_mark_for_close(conn);
return -1;