From: Marcus Griep <marcus@griep.us>
Date: Wed, 24 Jun 2009 03:09:27 +0000 (-0400)
Subject: Flush long replies over control port on QUIT
X-Git-Tag: tor-0.2.1.17-rc~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fa89c9f0868d4902e0298ac9ef23e521633f933b;p=thirdparty%2Ftor.git

Flush long replies over control port on QUIT

Marks the control port connection for flushing before closing when
the QUIT command is issued. This allows a QUIT to be issued during
a long reply over the control port, flushing the reply and then
closing the connection. Fixes bug 1015.
---

diff --git a/src/or/control.c b/src/or/control.c
index 486ccc4c75..98c6aa458c 100644
--- a/src/or/control.c
+++ b/src/or/control.c
@@ -2892,6 +2892,7 @@ connection_control_process_inbuf(control_connection_t *conn)
   if (!strcasecmp(conn->incoming_cmd, "QUIT")) {
     connection_write_str_to_buf("250 closing connection\r\n", conn);
     connection_mark_for_close(TO_CONN(conn));
+    conn->_base.hold_open_until_flushed = 1;
     return 0;
   }