[or-cvs] forward-port the circuit_resume_edge_reading_helper fix.

[Roger Dingledine]

Update of /home2/or/cvsroot/tor/src/or
In directory moria.mit.edu:/home2/arma/work/onion/cvs/tor/src/or

Modified Files:
	relay.c 
Log Message:
forward-port the circuit_resume_edge_reading_helper fix.


Index: relay.c
===================================================================
RCS file: /home2/or/cvsroot/tor/src/or/relay.c,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -d -r1.53 -r1.54
--- relay.c	23 Mar 2005 03:02:44 -0000	1.53
+++ relay.c	24 Mar 2005 21:57:45 -0000	1.54
@@ -1110,6 +1110,8 @@
                                    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);