upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-02-20 00:10:41 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14

BUG/MINOR: cli: Don't set SE flags from the cli applet

Browse source 
Since the CLI was updated to use the new applet API, it should no longer set
directly the SE flags. Instead, the corresponding applet flags must be set,
using the applet API (appet_set_*). It is true for the CLI I/O handler but also
for the commands parse function and I/O callback function.

This patch should be backported as far as 3.0.
This commit is contained in:
Christopher Faulet 2025-02-06 15:15:27 +01:00
parent 0aa69e7865
commit 7e927243b9
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/cli.c
View file

@ -1181,7 +1181,7 @@ static void cli_io_handler(struct appctx *appctx)
}
break;
default: /* abnormal state */
se_fl_set(appctx->sedesc, SE_FL_ERROR);
applet_set_error(appctx);
break;
}
@ -2442,7 +2442,7 @@ out:
ha_warning("Cannot make the unix socket non-blocking\n");
goto out;
}
se_fl_set(appctx->sedesc, SE_FL_EOI);
applet_set_eoi(appctx);
appctx->st0 = CLI_ST_END;
free(cmsgbuf);
free(tmpbuf);
@ -2464,7 +2464,7 @@ static int cli_parse_simple(char **args, char *payload, struct appctx *appctx, v
appctx->st1 ^= APPCTX_CLI_ST1_PROMPT;
else if (*args[0] == 'q') {
/* quit */
se_fl_set(appctx->sedesc, SE_FL_EOI);
applet_set_eoi(appctx);
appctx->st0 = CLI_ST_END;
}