From: Roger Dingledine <arma@torproject.org>
Date: Thu, 24 Mar 2005 21:57:45 +0000 (+0000)
Subject: forward-port the circuit_resume_edge_reading_helper fix.
X-Git-Tag: tor-0.1.0.1-rc~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4abb54a876e2da7f0706975237908df553eb75a6;p=thirdparty%2Ftor.git

forward-port the circuit_resume_edge_reading_helper fix.


svn:r3863
---

diff --git a/src/or/relay.c b/src/or/relay.c
index 60ff492867..7135569bbf 100644
--- a/src/or/relay.c
+++ b/src/or/relay.c
@@ -1110,6 +1110,8 @@ circuit_resume_edge_reading_helper(connection_t *conn,
                                    crypt_path_t *layer_hint) {
 
   for ( ; conn; conn=conn->next_stream) {
+    if (conn->marked_for_close)
+      continue;
     if ((!layer_hint && conn->package_window > 0) ||
         (layer_hint && conn->package_window > 0 && conn->cpath_layer == layer_hint)) {
       connection_start_reading(conn);