bugfix: we were closing socks-request connections immediately, rather

than flushing them, if they were timing out before we marked them


svn:r1366

1 files changed, 6 insertions, 0 deletions

diff --git a/src/or/connection.c b/src/or/connection.c
index eeb0501b1d..583a969572 100644
--- a/src/or/connection.c
+++ b/src/or/connection.c
@@ -224,6 +224,12 @@ _connection_mark_for_close(connection_t *conn, char reason)
       ;
     }
   conn->marked_for_close = 1;
+
+  /* in case we're going to be held-open-til-flushed, reset
+   * the number of seconds since last successful write, so
+   * we get our whole 15 seconds */
+  conn->timestamp_lastwritten = time(NULL);
+
   return retval;
 }