bugfix: when you finish answering a 'resolve' request, hold the

connection open so you can flush the answer

svn:r2148

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index 29f948ecec68317bccd9ab2bf4ae4ece9ec3c376..35500309ea6e4530cf97e1afbe87ba5d754db9b6 100644 (file)
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -379,6 +379,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
       conn->socks_request->has_finished = 1;
       conn->has_sent_end = 1;
       connection_mark_for_close(conn);
+      conn->hold_open_until_flushed = 1;
       return 0;
     }
     answer = htonl(client_dns_lookup_entry(socks->address));
@@ -388,6 +389,7 @@ static int connection_ap_handshake_process_socks(connection_t *conn) {
       conn->socks_request->has_finished = 1;
       conn->has_sent_end = 1;
       connection_mark_for_close(conn);
+      conn->hold_open_until_flushed = 1;
       return 0;
     }
   }

diff --git a/src/or/relay.c b/src/or/relay.c
index 36c3896eb1a6afec6e45b2472440f9685a9c1841..e95235f89b65237b3e071e83dc613f49625e9318 100644 (file)
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -581,6 +581,7 @@ connection_edge_process_relay_cell_not_open(
     conn->socks_request->has_finished = 1;
     conn->has_sent_end = 1;
     connection_mark_for_close(conn);
+    conn->hold_open_until_flushed = 1;
     return 0;
   }