Bug 40801: Do not change read state of marked conns

diff --git a/src/core/or/relay.c b/src/core/or/relay.c
index 247024ebc764d01d3dfc2a5c0e0d8598e0c9add6..2c722f01cc48f63988f7a9f0ac1135b4df688413 100644 (file)
--- a/src/core/or/relay.c
+++ b/src/core/or/relay.c
@@ -3081,9 +3081,9 @@ set_block_state_for_streams(circuit_t *circ, edge_connection_t *stream_list,
     if (stream_id && edge->stream_id != stream_id)
       continue;
 
-    if (!conn->read_event || edge->xoff_received) {
-      /* This connection is a placeholder for something; probably a DNS
-       * request.  It can't actually stop or start reading.*/
+    if (!conn->read_event || edge->xoff_received ||
+        conn->marked_for_close) {
+      /* This connection should not start or stop reading. */
       continue;
     }