CLEANUP: connection: Remove CS_FL_READ_PARTIAL flag

Since the recent refactoring of the H1 multiplexer, this flag is no more
used. Thus it is removed.

diff --git a/contrib/debug/flags.c b/contrib/debug/flags.c
index d845e4efe2a0a69ea7dbebd47b242901abfd6a07..044221ea41fa4f4be50d61dc4dea20252e8d0adc 100644 (file)
--- a/contrib/debug/flags.c
+++ b/contrib/debug/flags.c
@@ -180,7 +180,6 @@ void show_cs_flags(unsigned int f)
                printf("0\n");
                return;
        }
-       SHOW_FLAG(f, CS_FL_READ_PARTIAL);
        SHOW_FLAG(f, CS_FL_NOT_FIRST);
        SHOW_FLAG(f, CS_FL_KILL_CONN);
        SHOW_FLAG(f, CS_FL_WAIT_FOR_HS);

diff --git a/include/haproxy/connection-t.h b/include/haproxy/connection-t.h
index c79f8503078d2f8f8e181e17ff875858bd341dc8..4b1a21d1310e406f8b48c7c69e8925b31e1e450d 100644 (file)
--- a/include/haproxy/connection-t.h
+++ b/include/haproxy/connection-t.h
@@ -81,7 +81,6 @@ enum {
         * the stream-interface :
         */
        CS_FL_NOT_FIRST     = 0x00100000,  /* this stream is not the first one */
-       CS_FL_READ_PARTIAL  = 0x00200000,  /* some data were received (not necessarily xferred) */
 };
 
 /* cs_shutr() modes */

diff --git a/src/stream_interface.c b/src/stream_interface.c
index a6be2c9a0ac2cb9f6891dc7d643ccca13129b35c..45bcea31810ad564d386bdd3ed1b9004f61f9146 100644 (file)
--- a/src/stream_interface.c
+++ b/src/stream_interface.c
@@ -1346,12 +1346,6 @@ int si_cs_recv(struct conn_stream *cs)
                if (cs->flags & CS_FL_WANT_ROOM)
                        si_rx_room_blk(si);
 
-               if (cs->flags & CS_FL_READ_PARTIAL) {
-                       if (tick_isset(ic->rex))
-                               ic->rex = tick_add_ifset(now_ms, ic->rto);
-                       cs->flags &= ~CS_FL_READ_PARTIAL;
-               }
-
                if (ret <= 0) {
                        /* if we refrained from reading because we asked for a
                         * flush to satisfy rcv_pipe(), we must not subscribe