mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-02-05 01:11:51 +01:00
Code Issues Projects Releases Wiki Activity

CLEANUP: connection: remove the now unused CS_FL_REOS flag

Browse Source 
Let's remove it before it gets uesd again. It was mostly replaced with
CS_FL_EOI and by mux-specific states or flags.
This commit is contained in:
Willy Tarreau 2019-06-03 14:23:33 +02:00
parent c493c9cb08
commit 7bb39d7cd6
4 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
contrib/debug/flags.c
View File

@ -160,7 +160,6 @@ void show_cs_flags(unsigned int f)
SHOW_FLAG(f, CS_FL_NOT_FIRST);
SHOW_FLAG(f, CS_FL_WAIT_FOR_HS);
SHOW_FLAG(f, CS_FL_EOI);
SHOW_FLAG(f, CS_FL_REOS);
SHOW_FLAG(f, CS_FL_EOS);
SHOW_FLAG(f, CS_FL_ERR_PENDING);
SHOW_FLAG(f, CS_FL_WANT_ROOM);

2
include/proto/connection.h
View File

@ -513,7 +513,7 @@ static inline void cs_set_error(struct conn_stream *cs)
if (cs->flags & CS_FL_EOS)
cs->flags |= CS_FL_ERROR;
else
cs->flags |= CS_FL_REOS | CS_FL_ERR_PENDING;
cs->flags |= CS_FL_ERR_PENDING;
}
/* detect sock->data read0 transition */

2
include/types/connection.h
View File

@ -93,7 +93,7 @@ enum {
CS_FL_WANT_ROOM = 0x00000400, /* More bytes to transfert, but not enough room */
CS_FL_ERR_PENDING = 0x00000800, /* An error is pending, but there's still data to be read */
CS_FL_EOS = 0x00001000, /* End of stream delivered to data layer */
CS_FL_REOS = 0x00002000, /* End of stream received (buffer not empty) */
/* unused: 0x00002000 */
CS_FL_EOI = 0x00004000, /* end-of-input reached */
/* unused: 0x00008000 */
CS_FL_WAIT_FOR_HS = 0x00010000, /* This stream is waiting for handhskae */

2
src/backend.c
View File

@ -1230,7 +1230,7 @@ int connect_server(struct stream *s)
if (!srv_conn->target || srv_conn->target == s->target) {
srv_conn->flags &= ~(CO_FL_ERROR | CO_FL_SOCK_RD_SH | CO_FL_SOCK_WR_SH);
if (srv_cs)
srv_cs->flags &= ~(CS_FL_ERROR | CS_FL_EOS | CS_FL_REOS);
srv_cs->flags &= ~(CS_FL_ERROR | CS_FL_EOS);
reuse = 1;
old_conn = srv_conn;
} else {