]> git.ipfire.org Git - thirdparty/haproxy.git/commitdiff
BUG/MAJOR: stream-int: don't call si_cs_recv() in stream_int_chk_rcv_conn()
authorWilly Tarreau <w@1wt.eu>
Tue, 30 Oct 2018 10:01:08 +0000 (11:01 +0100)
committerWilly Tarreau <w@1wt.eu>
Tue, 30 Oct 2018 10:05:24 +0000 (11:05 +0100)
This one causes some events to be lost. It has already been tested in
an experimental branch but was not merged until being certain it was
needed. Fred figured that requesting /?k=1&s=447392 from httpterm through
haproxy-master was enough to stall the transfer.

No backport is needed, this only affects 1.9-dev5.

src/stream_interface.c

index dbc9d167a421ed571c7d183e91967d4f3dde0fa2..b719c746db4dcea746f7c0781cfae0c1321f9e09 100644 (file)
@@ -964,13 +964,9 @@ static void stream_int_chk_rcv_conn(struct stream_interface *si)
                si->flags |= SI_FL_WAIT_ROOM;
        }
        else {
-               struct conn_stream *cs = objt_cs(si->end);
                /* (re)start reading */
                si->flags &= ~SI_FL_WAIT_ROOM;
-               if (cs) {
-                       si_cs_recv(cs);
-                       tasklet_wakeup(si->wait_event.task);
-       }
+               tasklet_wakeup(si->wait_event.task);
        }
 }