From: Roger Dingledine <arma@torproject.org>
Date: Mon, 9 Feb 2009 02:50:19 +0000 (+0000)
Subject: decide that mikeperry's bug should be fixed in 0.2.1.x
X-Git-Tag: tor-0.2.1.12-alpha~7
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3845087b0451500511cd58c353695be946728c74;p=thirdparty%2Ftor.git

decide that mikeperry's bug should be fixed in 0.2.1.x
(but not in 0.2.1.12-alpha, sorry)


svn:r18417
---

diff --git a/src/or/connection_edge.c b/src/or/connection_edge.c
index a93cfb06b3..cd04f3287d 100644
--- a/src/or/connection_edge.c
+++ b/src/or/connection_edge.c
@@ -409,8 +409,11 @@ connection_ap_expire_beginning(void)
       ? LOG_INFO : LOG_NOTICE;
     seconds_idle = (int)( now - conn->_base.timestamp_lastread );
 
-    /* XXX022 this clause may be redundant with the clause in
-     * connection_ap_handshake_attach_circuit(). Is it? -RD */
+    /* XXX021 this clause was originally thought redundant with the
+     * clause in connection_ap_handshake_attach_circuit(). But actually,
+     * we need it because controllers that put streams in controller_wait
+     * state never go to the other clause. we should fix so it compares
+     * seconds since timestamp_created, not since last read. -RD */
     if (AP_CONN_STATE_IS_UNATTACHED(conn->_base.state)) {
       if (seconds_idle >= options->SocksTimeout) {
         log_fn(severity, LD_APP,