torproject/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-12-06 19:41:15 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

decide that mikeperry's bug should be fixed in 0.2.1.x

Browse Source 
(but not in 0.2.1.12-alpha, sorry)


svn:r18417
This commit is contained in:
Roger Dingledine
2009-02-09 02:50:19 +00:00
parent 79e276bf81
commit 3845087b04
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/or/connection_edge.c
+5 -2
View File
@@ -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,