Adding upstream version 3.0.0.upstream/3.0.0

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 1955 insertions, 746 deletions

diff --git a/src/log.c b/src/log.c
index 42b905c..7b632c7 100644
--- a/src/log.c
+++ b/src/log.c
@@ -33,6 +33,10 @@
 #include <haproxy/http.h>
 #include <haproxy/http_ana.h>
 #include <haproxy/listener.h>
+#include <haproxy/lb_chash.h>
+#include <haproxy/lb_fwrr.h>
+#include <haproxy/lb_map.h>
+#include <haproxy/lb_ss.h>
 #include <haproxy/log.h>
 #include <haproxy/proxy.h>
 #include <haproxy/sample.h>
@@ -45,6 +49,7 @@
 #include <haproxy/time.h>
 #include <haproxy/hash.h>
 #include <haproxy/tools.h>
+#include <haproxy/vecpair.h>
 
 /* global recv logs counter */
 int cum_log_messages;
@@ -90,7 +95,9 @@ static const struct log_fmt_st log_formats[LOG_FORMATS] = {
  * that the byte should be escaped. Be careful to always pass bytes from 0 to
  * 255 exclusively to the macros.
  */
+long no_escape_map[(256/8) / sizeof(long)];
 long rfc5424_escape_map[(256/8) / sizeof(long)];
+long json_escape_map[(256/8) / sizeof(long)];
 long hdr_encode_map[(256/8) / sizeof(long)];
 long url_encode_map[(256/8) / sizeof(long)];
 long http_encode_map[(256/8) / sizeof(long)];
@@ -112,21 +119,81 @@ const char *log_levels[NB_LOG_LEVELS] = {
 
 const char sess_term_cond[16] = "-LcCsSPRIDKUIIII"; /* normal, Local, CliTo, CliErr, SrvTo, SrvErr, PxErr, Resource, Internal, Down, Killed, Up, -- */
 const char sess_fin_state[8]  = "-RCHDLQT";	/* cliRequest, srvConnect, srvHeader, Data, Last, Queue, Tarpit */
+const struct buffer empty = { };
 
 
-/* log_format   */
-struct logformat_type {
-	char *name;
-	int type;
-	int mode;
-	int lw; /* logwait bitsfield */
-	int (*config_callback)(struct logformat_node *node, struct proxy *curproxy);
-};
-
 int prepare_addrsource(struct logformat_node *node, struct proxy *curproxy);
 
-/* log_format variable names */
-static const struct logformat_type logformat_keywords[] = {
+/* logformat alias types (internal use) */
+enum logformat_alias_type {
+	LOG_FMT_GLOBAL,
+	LOG_FMT_CLIENTIP,
+	LOG_FMT_CLIENTPORT,
+	LOG_FMT_BACKENDIP,
+	LOG_FMT_BACKENDPORT,
+	LOG_FMT_FRONTENDIP,
+	LOG_FMT_FRONTENDPORT,
+	LOG_FMT_SERVERPORT,
+	LOG_FMT_SERVERIP,
+	LOG_FMT_COUNTER,
+	LOG_FMT_LOGCNT,
+	LOG_FMT_PID,
+	LOG_FMT_DATE,
+	LOG_FMT_DATEGMT,
+	LOG_FMT_DATELOCAL,
+	LOG_FMT_TS,
+	LOG_FMT_MS,
+	LOG_FMT_FRONTEND,
+	LOG_FMT_FRONTEND_XPRT,
+	LOG_FMT_BACKEND,
+	LOG_FMT_SERVER,
+	LOG_FMT_BYTES,
+	LOG_FMT_BYTES_UP,
+	LOG_FMT_Ta,
+	LOG_FMT_Th,
+	LOG_FMT_Ti,
+	LOG_FMT_TQ,
+	LOG_FMT_TW,
+	LOG_FMT_TC,
+	LOG_FMT_Tr,
+	LOG_FMT_tr,
+	LOG_FMT_trg,
+	LOG_FMT_trl,
+	LOG_FMT_TR,
+	LOG_FMT_TD,
+	LOG_FMT_TT,
+	LOG_FMT_TU,
+	LOG_FMT_STATUS,
+	LOG_FMT_CCLIENT,
+	LOG_FMT_CSERVER,
+	LOG_FMT_TERMSTATE,
+	LOG_FMT_TERMSTATE_CK,
+	LOG_FMT_ACTCONN,
+	LOG_FMT_FECONN,
+	LOG_FMT_BECONN,
+	LOG_FMT_SRVCONN,
+	LOG_FMT_RETRIES,
+	LOG_FMT_SRVQUEUE,
+	LOG_FMT_BCKQUEUE,
+	LOG_FMT_HDRREQUEST,
+	LOG_FMT_HDRRESPONS,
+	LOG_FMT_HDRREQUESTLIST,
+	LOG_FMT_HDRRESPONSLIST,
+	LOG_FMT_REQ,
+	LOG_FMT_HTTP_METHOD,
+	LOG_FMT_HTTP_URI,
+	LOG_FMT_HTTP_PATH,
+	LOG_FMT_HTTP_PATH_ONLY,
+	LOG_FMT_HTTP_QUERY,
+	LOG_FMT_HTTP_VERSION,
+	LOG_FMT_HOSTNAME,
+	LOG_FMT_UNIQUEID,
+	LOG_FMT_SSL_CIPHER,
+	LOG_FMT_SSL_VERSION,
+};
+
+/* log_format alias names */
+static const struct logformat_alias logformat_aliases[] = {
 	{ "o", LOG_FMT_GLOBAL, PR_MODE_TCP, 0, NULL },  /* global option */
 
 	/* please keep these lines sorted ! */
@@ -208,6 +275,36 @@ char *log_format = NULL;
  */
 char default_rfc5424_sd_log_format[] = "- ";
 
+/* returns true if the input logformat string is one of the default ones declared
+ * above
+ */
+static inline int logformat_str_isdefault(const char *str)
+{
+	return str == httpclient_log_format ||
+	       str == default_http_log_format ||
+	       str == default_https_log_format ||
+	       str == clf_http_log_format ||
+	       str == default_tcp_log_format ||
+	       str == default_rfc5424_sd_log_format;
+}
+
+/* free logformat str if it is not a default (static) one */
+static inline void logformat_str_free(char **str)
+{
+	if (!logformat_str_isdefault(*str))
+		ha_free(str);
+}
+
+/* duplicate and return logformat str if it is not a default (static)
+ * one, else return the original one
+ */
+static inline char *logformat_str_dup(char *str)
+{
+	if (logformat_str_isdefault(str))
+		return str;
+	return strdup(str);
+}
+
 /* total number of dropped logs */
 unsigned int dropped_logs = 0;
 
@@ -221,17 +318,20 @@ THREAD_LOCAL char *logline = NULL;
  */
 THREAD_LOCAL char *logline_rfc5424 = NULL;
 
-struct logformat_var_args {
+struct logformat_node_args {
 	char *name;
 	int mask;
 };
 
-struct logformat_var_args var_args_list[] = {
+struct logformat_node_args node_args_list[] = {
 // global
 	{ "M", LOG_OPT_MANDATORY },
 	{ "Q", LOG_OPT_QUOTE },
 	{ "X", LOG_OPT_HEXA },
 	{ "E", LOG_OPT_ESC },
+	{ "bin", LOG_OPT_BIN },
+	{ "json", LOG_OPT_ENCODE_JSON },
+	{ "cbor", LOG_OPT_ENCODE_CBOR },
 	{  0,  0 }
 };
 
@@ -240,17 +340,19 @@ struct logformat_var_args var_args_list[] = {
  */
 int prepare_addrsource(struct logformat_node *node, struct proxy *curproxy)
 {
-	curproxy->options2 |= PR_O2_SRC_ADDR;
+	if ((curproxy->flags & PR_FL_CHECKED))
+		return 0;
 
-	return 0;
+	curproxy->options2 |= PR_O2_SRC_ADDR;
+	return 1;
 }
 
 
 /*
- * Parse args in a logformat_var. Returns 0 in error
+ * Parse args in a logformat_node. Returns 0 in error
  * case, otherwise, it returns 1.
  */
-int parse_logformat_var_args(char *args, struct logformat_node *node, char **err)
+int parse_logformat_node_args(char *args, struct logformat_node *node, char **err)
 {
 	int i = 0;
 	int end = 0;
@@ -258,7 +360,7 @@ int parse_logformat_var_args(char *args, struct logformat_node *node, char **err
 	char *sp = NULL; // start pointer
 
 	if (args == NULL) {
-		memprintf(err, "internal error: parse_logformat_var_args() expects non null 'args'");
+		memprintf(err, "internal error: parse_logformat_node_args() expects non null 'args'");
 		return 0;
 	}
 
@@ -279,13 +381,19 @@ int parse_logformat_var_args(char *args, struct logformat_node *node, char **err
 
 		if (*args == '\0' || *args == ',') {
 			*args = '\0';
-			for (i = 0; sp && var_args_list[i].name; i++) {
-				if (strcmp(sp, var_args_list[i].name) == 0) {
+			for (i = 0; sp && node_args_list[i].name; i++) {
+				if (strcmp(sp, node_args_list[i].name) == 0) {
 					if (flags == 1) {
-						node->options |= var_args_list[i].mask;
+						/* Ensure we don't mix encoding types, existing
+						 * encoding type prevails over new ones
+						 */
+						if (node->options & LOG_OPT_ENCODE)
+							node->options |= (node_args_list[i].mask & ~LOG_OPT_ENCODE);
+						else
+							node->options |= node_args_list[i].mask;
 						break;
 					} else if (flags == 2) {
-						node->options &= ~var_args_list[i].mask;
+						node->options &= ~node_args_list[i].mask;
 						break;
 					}
 				}
@@ -300,64 +408,71 @@ int parse_logformat_var_args(char *args, struct logformat_node *node, char **err
 }
 
 /*
- * Parse a variable '%varname' or '%{args}varname' in log-format. The caller
+ * Parse an alias '%aliasname' or '%{args}aliasname' in log-format. The caller
  * must pass the args part in the <arg> pointer with its length in <arg_len>,
- * and varname with its length in <var> and <var_len> respectively. <arg> is
- * ignored when arg_len is 0. Neither <var> nor <var_len> may be null.
+ * and aliasname with its length in <alias> and <alias_len> respectively. <arg>
+ * is ignored when arg_len is 0. Neither <alias> nor <alias_len> may be null.
  * Returns false in error case and err is filled, otherwise returns true.
  */
-int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct proxy *curproxy, struct list *list_format, int *defoptions, char **err)
+static int parse_logformat_alias(char *arg, int arg_len, char *name, int name_len, int typecast,
+                                 char *alias, int alias_len, struct lf_expr *lf_expr,
+                                 int *defoptions, char **err)
 {
 	int j;
+	struct list *list_format= &lf_expr->nodes.list;
 	struct logformat_node *node = NULL;
 
-	for (j = 0; logformat_keywords[j].name; j++) { // search a log type
-		if (strlen(logformat_keywords[j].name) == var_len &&
-		    strncmp(var, logformat_keywords[j].name, var_len) == 0) {
-			if (logformat_keywords[j].mode != PR_MODE_HTTP || curproxy->mode == PR_MODE_HTTP) {
-				node = calloc(1, sizeof(*node));
-				if (!node) {
-					memprintf(err, "out of memory error");
+	for (j = 0; logformat_aliases[j].name; j++) { // search a log type
+		if (strlen(logformat_aliases[j].name) == alias_len &&
+		    strncmp(alias, logformat_aliases[j].name, alias_len) == 0) {
+			node = calloc(1, sizeof(*node));
+			if (!node) {
+				memprintf(err, "out of memory error");
+				goto error_free;
+			}
+			node->type = LOG_FMT_ALIAS;
+			node->alias = &logformat_aliases[j];
+			node->typecast = typecast;
+			if (name && name_len)
+				node->name = my_strndup(name, name_len);
+			node->options = *defoptions;
+			if (arg_len) {
+				node->arg = my_strndup(arg, arg_len);
+				if (!parse_logformat_node_args(node->arg, node, err))
 					goto error_free;
+			}
+			if (node->alias->type == LOG_FMT_GLOBAL) {
+				*defoptions = node->options;
+				if (lf_expr->nodes.options == LOG_OPT_NONE)
+					lf_expr->nodes.options = node->options;
+				else {
+					/* global options were previously set and were
+					 * overwritten for nodes that appear after the
+					 * current one.
+					 *
+					 * However, for lf_expr->nodes.options we must
+					 * keep a track of options common to ALL nodes,
+					 * thus we take previous global options into
+					 * account to compute the new logformat
+					 * expression wide (global) node options.
+					 */
+					lf_expr->nodes.options &= node->options;
 				}
-				node->type = logformat_keywords[j].type;
-				node->options = *defoptions;
-				if (arg_len) {
-					node->arg = my_strndup(arg, arg_len);
-					if (!parse_logformat_var_args(node->arg, node, err))
-						goto error_free;
-				}
-				if (node->type == LOG_FMT_GLOBAL) {
-					*defoptions = node->options;
-					free(node->arg);
-					free(node);
-				} else {
-					if (logformat_keywords[j].config_callback &&
-					    logformat_keywords[j].config_callback(node, curproxy) != 0) {
-						goto error_free;
-					}
-					curproxy->to_log |= logformat_keywords[j].lw;
-					LIST_APPEND(list_format, &node->list);
-				}
-				return 1;
+				free_logformat_node(node);
 			} else {
-				memprintf(err, "format variable '%s' is reserved for HTTP mode",
-				          logformat_keywords[j].name);
-				goto error_free;
+				LIST_APPEND(list_format, &node->list);
 			}
+			return 1;
 		}
 	}
 
-	j = var[var_len];
-	var[var_len] = 0;
-	memprintf(err, "no such format variable '%s'. If you wanted to emit the '%%' character verbatim, you need to use '%%%%'", var);
-	var[var_len] = j;
+	j = alias[alias_len];
+	alias[alias_len] = 0;
+	memprintf(err, "no such format alias '%s'. If you wanted to emit the '%%' character verbatim, you need to use '%%%%'", alias);
+	alias[alias_len] = j;
 
   error_free:
-	if (node) {
-		free(node->arg);
-		free(node);
-	}
+	free_logformat_node(node);
 	return 0;
 }
 
@@ -367,13 +482,14 @@ int parse_logformat_var(char *arg, int arg_len, char *var, int var_len, struct p
  *  start: start pointer
  *  end: end text pointer
  *  type: string type
- *  list_format: destination list
+ *  lf_expr: destination logformat expr (list of fmt nodes)
  *
  *  LOG_TEXT: copy chars from start to end excluding end.
  *
 */
-int add_to_logformat_list(char *start, char *end, int type, struct list *list_format, char **err)
+int add_to_logformat_list(char *start, char *end, int type, struct lf_expr *lf_expr, char **err)
 {
+	struct list *list_format = &lf_expr->nodes.list;
 	char *str;
 
 	if (type == LF_TEXT) { /* type text */
@@ -401,17 +517,19 @@ int add_to_logformat_list(char *start, char *end, int type, struct list *list_fo
 }
 
 /*
- * Parse the sample fetch expression <text> and add a node to <list_format> upon
- * success. At the moment, sample converters are not yet supported but fetch arguments
- * should work. The curpx->conf.args.ctx must be set by the caller. If an end pointer
+ * Parse the sample fetch expression <text> and add a node to <lf_expr> upon
+ * success. The curpx->conf.args.ctx must be set by the caller. If an end pointer
  * is passed in <endptr>, it will be updated with the pointer to the first character
  * not part of the sample expression.
  *
  * In error case, the function returns 0, otherwise it returns 1.
  */
-int add_sample_to_logformat_list(char *text, char *arg, int arg_len, struct proxy *curpx, struct list *list_format, int options, int cap, char **err, char **endptr)
+static int add_sample_to_logformat_list(char *text, char *name, int name_len, int typecast,
+                                        char *arg, int arg_len, struct lf_expr *lf_expr,
+                                        struct arg_list *al, int options, int cap, char **err, char **endptr)
 {
 	char *cmd[2];
+	struct list *list_format = &lf_expr->nodes.list;
 	struct sample_expr *expr = NULL;
 	struct logformat_node *node = NULL;
 	int cmd_arg;
@@ -420,8 +538,8 @@ int add_sample_to_logformat_list(char *text, char *arg, int arg_len, struct prox
 	cmd[1] = "";
 	cmd_arg = 0;
 
-	expr = sample_parse_expr(cmd, &cmd_arg, curpx->conf.args.file, curpx->conf.args.line, err,
-				 &curpx->conf.args, endptr);
+	expr = sample_parse_expr(cmd, &cmd_arg, lf_expr->conf.file, lf_expr->conf.line, err,
+				 al, endptr);
 	if (!expr) {
 		memprintf(err, "failed to parse sample expression <%s> : %s", text, *err);
 		goto error_free;
@@ -429,16 +547,20 @@ int add_sample_to_logformat_list(char *text, char *arg, int arg_len, struct prox
 
 	node = calloc(1, sizeof(*node));
 	if (!node) {
+		release_sample_expr(expr);
 		memprintf(err, "out of memory error");
 		goto error_free;
 	}
+	if (name && name_len)
+		node->name = my_strndup(name, name_len);
 	node->type = LOG_FMT_EXPR;
+	node->typecast = typecast;
 	node->expr = expr;
 	node->options = options;
 
 	if (arg_len) {
 		node->arg = my_strndup(arg, arg_len);
-		if (!parse_logformat_var_args(node->arg, node, err))
+		if (!parse_logformat_node_args(node->arg, node, err))
 			goto error_free;
 	}
 	if (expr->fetch->val & cap & SMP_VAL_REQUEST)
@@ -455,71 +577,71 @@ int add_sample_to_logformat_list(char *text, char *arg, int arg_len, struct prox
 
 	if ((options & LOG_OPT_HTTP) && (expr->fetch->use & (SMP_USE_L6REQ|SMP_USE_L6RES))) {
 		ha_warning("parsing [%s:%d] : L6 sample fetch <%s> ignored in HTTP log-format string.\n",
-			   curpx->conf.args.file, curpx->conf.args.line, text);
+			   lf_expr->conf.file, lf_expr->conf.line, text);
 	}
 
-	/* check if we need to allocate an http_txn struct for HTTP parsing */
-	/* Note, we may also need to set curpx->to_log with certain fetches */
-	curpx->http_needed |= !!(expr->fetch->use & SMP_USE_HTTP_ANY);
-
-	/* FIXME: temporary workaround for missing LW_XPRT and LW_REQ flags
-	 * needed with some sample fetches (eg: ssl*). We always set it for
-	 * now on, but this will leave with sample capabilities soon.
-	 */
-	curpx->to_log |= LW_XPRT;
-	if (curpx->http_needed)
-		curpx->to_log |= LW_REQ;
 	LIST_APPEND(list_format, &node->list);
 	return 1;
 
   error_free:
-	release_sample_expr(expr);
-	if (node) {
-		free(node->arg);
-		free(node);
-	}
+	free_logformat_node(node);
 	return 0;
 }
 
 /*
- * Parse the log_format string and fill a linked list.
- * Variable name are preceded by % and composed by characters [a-zA-Z0-9]* : %varname
- * You can set arguments using { } : %{many arguments}varname.
- * The curproxy->conf.args.ctx must be set by the caller.
+ * Compile logformat expression (from string to list of logformat nodes)
+ *
+ * Aliases are preceded by % and composed by characters [a-zA-Z0-9]* : %aliasname
+ * Expressions are preceded by % and enclosed in square brackets: %[expr]
+ * You can set arguments using { } : %{many arguments}aliasname
+ *                                   %{many arguments}[expr]
  *
- *  fmt: the string to parse
- *  curproxy: the proxy affected
- *  list_format: the destination list
+ *  lf_expr: the destination logformat expression (logformat_node list)
+ *           which is supposed to be configured (str and conf set) but
+ *           shouldn't be compiled (shouldn't contain any nodes)
+ *  al: arg list where sample expr should store arg dependency (if the logformat
+ *      expression involves sample expressions), may be NULL
  *  options: LOG_OPT_* to force on every node
  *  cap: all SMP_VAL_* flags supported by the consumer
  *
  * The function returns 1 in success case, otherwise, it returns 0 and err is filled.
  */
-int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list *list_format, int options, int cap, char **err)
+int lf_expr_compile(struct lf_expr *lf_expr,
+                    struct arg_list *al, int options, int cap, char **err)
 {
+	char *fmt = lf_expr->str; /* will be freed unless default */
 	char *sp, *str, *backfmt; /* start pointer for text parts */
 	char *arg = NULL; /* start pointer for args */
-	char *var = NULL; /* start pointer for vars */
+	char *alias = NULL; /* start pointer for aliases */
+	char *name = NULL; /* token name (optional) */
+	char *typecast_str = NULL; /* token output type (if custom name is set) */
 	int arg_len = 0;
-	int var_len = 0;
+	int alias_len = 0;
+	int name_len = 0;
+	int typecast = SMP_T_SAME; /* relaxed by default */
 	int cformat; /* current token format */
 	int pformat; /* previous token format */
-	struct logformat_node *tmplf, *back;
+
+	BUG_ON((lf_expr->flags & LF_FL_COMPILED));
+
+	if (!fmt)
+		return 1; // nothing to do
 
 	sp = str = backfmt = strdup(fmt);
 	if (!str) {
 		memprintf(err, "out of memory error");
 		return 0;
 	}
-	curproxy->to_log |= LW_INIT;
 
-	/* flush the list first. */
-	list_for_each_entry_safe(tmplf, back, list_format, list) {
-		LIST_DELETE(&tmplf->list);
-		release_sample_expr(tmplf->expr);
-		free(tmplf->arg);
-		free(tmplf);
-	}
+	/* Prepare lf_expr nodes, past this lf_expr doesn't know about ->str
+	 * anymore as ->str and ->nodes are part of the same union. ->str has
+	 * been saved as local 'fmt' string pointer, so we must free it before
+	 * returning.
+	 */
+	LIST_INIT(&lf_expr->nodes.list);
+	lf_expr->nodes.options = LOG_OPT_NONE;
+	/* we must set the compiled flag now for proper deinit in case of failure */
+	lf_expr->flags |= LF_FL_COMPILED;
 
 	for (cformat = LF_INIT; cformat != LF_END; str++) {
 		pformat = cformat;
@@ -533,20 +655,62 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 		 * We use the common LF_INIT state to dispatch to the different final states.
 		 */
 		switch (pformat) {
-		case LF_STARTVAR:                      // text immediately following a '%'
-			arg = NULL; var = NULL;
-			arg_len = var_len = 0;
+		case LF_STARTALIAS:                    // text immediately following a '%'
+			arg = NULL; alias = NULL;
+			name = NULL;
+			name_len = 0;
+			typecast = SMP_T_SAME;
+			arg_len = alias_len = 0;
+			if (*str == '(') {             // custom output name
+				cformat = LF_STONAME;
+				name = str + 1;
+			}
+			else
+				goto startalias;
+			break;
+
+		case LF_STONAME:                       // text immediately following '%('
+		case LF_STOTYPE:
+			if (cformat == LF_STONAME && *str == ':') { // start custom output type
+				cformat = LF_STOTYPE;
+				name_len = str -name;
+				typecast_str = str + 1;
+			}
+			else if (*str == ')') {        // end of custom output name
+				if (cformat == LF_STONAME)
+					name_len = str - name;
+				else {
+					/* custom type */
+					*str = 0; // so that typecast_str is 0 terminated
+					typecast = type_to_smp(typecast_str);
+					if (typecast != SMP_T_STR && typecast != SMP_T_SINT &&
+					    typecast != SMP_T_BOOL) {
+						memprintf(err, "unexpected output type '%.*s' at position %d line : '%s'. Supported types are: str, sint, bool", (int)(str - typecast_str), typecast_str, (int)(typecast_str - backfmt), fmt);
+						goto fail;
+					}
+				}
+				cformat = LF_EDONAME;
+			} else if  (!isalnum((unsigned char)*str) && *str != '_' && *str != '-') {
+				memprintf(err, "invalid character in custom name near '%c' at position %d line : '%s'",
+				          *str, (int)(str - backfmt), fmt);
+
+				goto fail;
+			}
+			break;
+
+		case LF_EDONAME:                       // text immediately following %(name)
+ startalias:
 			if (*str == '{') {             // optional argument
 				cformat = LF_STARG;
 				arg = str + 1;
 			}
 			else if (*str == '[') {
 				cformat = LF_STEXPR;
-				var = str + 1;         // store expr in variable name
+				alias = str + 1;       // store expr in alias name
 			}
-			else if (isalpha((unsigned char)*str)) { // variable name
-				cformat = LF_VAR;
-				var = str;
+			else if (isalpha((unsigned char)*str)) { // alias name
+				cformat = LF_ALIAS;
+				alias = str;
 			}
 			else if (*str == '%')
 				cformat = LF_TEXT;     // convert this character to a literal (useful for '%')
@@ -555,7 +719,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 				cformat = LF_TEXT;
 				pformat = LF_TEXT; /* finally we include the previous char as well */
 				sp = str - 1; /* send both the '%' and the current char */
-				memprintf(err, "unexpected variable name near '%c' at position %d line : '%s'. Maybe you want to write a single '%%', use the syntax '%%%%'",
+				memprintf(err, "unexpected alias name near '%c' at position %d line : '%s'. Maybe you want to write a single '%%', use the syntax '%%%%'",
 				          *str, (int)(str - backfmt), fmt);
 				goto fail;
 
@@ -575,15 +739,15 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 		case LF_EDARG:                         // text immediately following '%{arg}'
 			if (*str == '[') {
 				cformat = LF_STEXPR;
-				var = str + 1;         // store expr in variable name
+				alias = str + 1;         // store expr in alias name
 				break;
 			}
-			else if (isalnum((unsigned char)*str)) { // variable name
-				cformat = LF_VAR;
-				var = str;
+			else if (isalnum((unsigned char)*str)) { // alias name
+				cformat = LF_ALIAS;
+				alias = str;
 				break;
 			}
-			memprintf(err, "parse argument modifier without variable name near '%%{%s}'", arg);
+			memprintf(err, "parse argument modifier without alias name near '%%{%s}'", arg);
 			goto fail;
 
 		case LF_STEXPR:                        // text immediately following '%['
@@ -592,7 +756,7 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 			 * part of the expression, which MUST be the trailing
 			 * angle bracket.
 			 */
-			if (!add_sample_to_logformat_list(var, arg, arg_len, curproxy, list_format, options, cap, err, &str))
+			if (!add_sample_to_logformat_list(alias, name, name_len, typecast, arg, arg_len, lf_expr, al, options, cap, err, &str))
 				goto fail;
 
 			if (*str == ']') {
@@ -604,26 +768,26 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 				char c = *str;
 				*str = 0;
 				if (isprint((unsigned char)c))
-					memprintf(err, "expected ']' after '%s', but found '%c'", var, c);
+					memprintf(err, "expected ']' after '%s', but found '%c'", alias, c);
 				else
-					memprintf(err, "missing ']' after '%s'", var);
+					memprintf(err, "missing ']' after '%s'", alias);
 				goto fail;
 			}
 			break;
 
-		case LF_VAR:                           // text part of a variable name
-			var_len = str - var;
+		case LF_ALIAS:                         // text part of a alias name
+			alias_len = str - alias;
 			if (!isalnum((unsigned char)*str))
-				cformat = LF_INIT;     // not variable name anymore
+				cformat = LF_INIT;     // not alias name anymore
 			break;
 
 		default:                               // LF_INIT, LF_TEXT, LF_SEPARATOR, LF_END, LF_EDEXPR
 			cformat = LF_INIT;
 		}
 
-		if (cformat == LF_INIT) { /* resynchronize state to text/sep/startvar */
+		if (cformat == LF_INIT) { /* resynchronize state to text/sep/startalias */
 			switch (*str) {
-			case '%': cformat = LF_STARTVAR;  break;
+			case '%': cformat = LF_STARTALIAS;  break;
 			case  0 : cformat = LF_END;       break;
 			case ' ':
 				if (options & LOG_OPT_MERGE_SPACES) {
@@ -637,13 +801,13 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 
 		if (cformat != pformat || pformat == LF_SEPARATOR) {
 			switch (pformat) {
-			case LF_VAR:
-				if (!parse_logformat_var(arg, arg_len, var, var_len, curproxy, list_format, &options, err))
+			case LF_ALIAS:
+				if (!parse_logformat_alias(arg, arg_len, name, name_len, typecast, alias, alias_len, lf_expr, &options, err))
 					goto fail;
 				break;
 			case LF_TEXT:
 			case LF_SEPARATOR:
-				if (!add_to_logformat_list(sp, str, pformat, list_format, err))
+				if (!add_to_logformat_list(sp, str, pformat, lf_expr, err))
 					goto fail;
 				break;
 			}
@@ -651,18 +815,236 @@ int parse_logformat_string(const char *fmt, struct proxy *curproxy, struct list
 		}
 	}
 
-	if (pformat == LF_STARTVAR || pformat == LF_STARG || pformat == LF_STEXPR) {
-		memprintf(err, "truncated line after '%s'", var ? var : arg ? arg : "%");
+	if (pformat == LF_STARTALIAS || pformat == LF_STARG || pformat == LF_STEXPR || pformat == LF_STONAME || pformat == LF_STOTYPE || pformat == LF_EDONAME) {
+		memprintf(err, "truncated line after '%s'", alias ? alias : arg ? arg : "%");
+		goto fail;
+	}
+	logformat_str_free(&fmt);
+	ha_free(&backfmt);
+
+	return 1;
+ fail:
+	logformat_str_free(&fmt);
+	ha_free(&backfmt);
+	return 0;
+}
+
+/* lf_expr_compile() helper: uses <curproxy> to deduce settings and
+ * simplify function usage, mostly for legacy purpose
+ *
+ * curproxy->conf.args.ctx must be set by the caller.
+ *
+ * The logformat expression will be scheduled for postcheck on the proxy unless
+ * the proxy was already checked, in which case all checks will be performed right
+ * away.
+ *
+ * Returns 1 on success and 0 on failure. On failure: <lf_expr> will be cleaned
+ * up and <err> will be set.
+ */
+int parse_logformat_string(const char *fmt, struct proxy *curproxy,
+                           struct lf_expr *lf_expr,
+                           int options, int cap, char **err)
+{
+	int ret;
+
+
+	/* reinit lf_expr (if previously set) */
+	lf_expr_deinit(lf_expr);
+
+	lf_expr->str = strdup(fmt);
+	if (!lf_expr->str) {
+		memprintf(err, "out of memory error");
+		goto fail;
+	}
+
+	/* Save some parsing infos to raise relevant error messages during
+	 * postparsing if needed
+	 */
+	if (curproxy->conf.args.file) {
+		lf_expr->conf.file = strdup(curproxy->conf.args.file);
+		lf_expr->conf.line = curproxy->conf.args.line;
+	}
+
+	ret = lf_expr_compile(lf_expr, &curproxy->conf.args, options, cap, err);
+
+	if (!ret)
+		goto fail;
+
+	if (!(curproxy->flags & PR_FL_CHECKED)) {
+		/* add the lf_expr to the proxy checks to delay postparsing
+		 * since config-related proxy properties are not stable yet
+		 */
+		LIST_APPEND(&curproxy->conf.lf_checks, &lf_expr->list);
+	}
+	else {
+		/* probably called during runtime or with proxy already checked,
+		 * perform the postcheck right away
+		 */
+		if (!lf_expr_postcheck(lf_expr, curproxy, err))
+			goto fail;
+	}
+	return 1;
+
+ fail:
+	lf_expr_deinit(lf_expr);
+	return 0;
+}
+
+/* automatically resolves incompatible LOG_OPT options by taking into
+ * account current options and global options
+ */
+static inline void _lf_expr_postcheck_node_opt(int *options, int g_options)
+{
+	/* encoding is incompatible with HTTP option, so it is ignored
+	 * if HTTP option is set, unless HTTP option wasn't set globally
+	 * and encoding was set globally, which means encoding takes the
+	 * precedence>
+	 */
+	if (*options & LOG_OPT_HTTP) {
+		if ((g_options & (LOG_OPT_HTTP | LOG_OPT_ENCODE)) == LOG_OPT_ENCODE) {
+			/* global encoding enabled and http enabled individually */
+			*options &= ~LOG_OPT_HTTP;
+		}
+		else
+			*options &= ~LOG_OPT_ENCODE;
+	}
+
+	if (*options & LOG_OPT_ENCODE) {
+		/* when encoding is set, ignore +E option */
+		*options &= ~LOG_OPT_ESC;
+	}
+}
+
+/* Performs LOG_OPT postparsing check on logformat node <node> belonging to a
+ * given logformat expression <lf_expr>
+ *
+ * It returns 1 on success and 0 on error, <err> will be set in case of error
+ */
+static int lf_expr_postcheck_node_opt(struct lf_expr *lf_expr, struct logformat_node *node, char **err)
+{
+	/* per-node encoding options cannot be disabled if already
+	 * enabled globally
+	 *
+	 * Also, ensure we don't mix encoding types, global setting
+	 * prevails over per-node one.
+	 *
+	 * Finally, ignore LOG_OPT_BIN since it is a global-only option
+	 */
+	if (lf_expr->nodes.options & LOG_OPT_ENCODE) {
+		node->options &= ~(LOG_OPT_BIN | LOG_OPT_ENCODE);
+		node->options |= (lf_expr->nodes.options & LOG_OPT_ENCODE);
+	}
+	else
+		node->options &= ~LOG_OPT_BIN;
+
+	_lf_expr_postcheck_node_opt(&node->options, lf_expr->nodes.options);
+
+	return 1;
+}
+
+/* Performs a postparsing check on logformat expression <expr> for a given <px>
+ * proxy. The function will behave differently depending on the proxy state
+ * (during parsing we will try to adapt proxy configuration to make it
+ * compatible with logformat expression, but once the proxy is checked, we fail
+ * as soon as we face incompatibilities)
+ *
+ * It returns 1 on success and 0 on error, <err> will be set in case of error.
+ */
+int lf_expr_postcheck(struct lf_expr *lf_expr, struct proxy *px, char **err)
+{
+	struct logformat_node *lf;
+
+	if (!(px->flags & PR_FL_CHECKED))
+		px->to_log |= LW_INIT;
+
+	/* postcheck global node options */
+	_lf_expr_postcheck_node_opt(&lf_expr->nodes.options, LOG_OPT_NONE);
+
+	list_for_each_entry(lf, &lf_expr->nodes.list, list) {
+		if (lf->type == LOG_FMT_EXPR) {
+			struct sample_expr *expr = lf->expr;
+			uint8_t http_needed = !!(expr->fetch->use & SMP_USE_HTTP_ANY);
+
+			if ((px->flags & PR_FL_CHECKED)) {
+				/* fail as soon as proxy properties are not compatible */
+				if (http_needed && !px->http_needed) {
+					memprintf(err, "sample fetch '%s' requires HTTP enabled proxy which is not available here",
+					          expr->fetch->kw);
+					goto fail;
+				}
+				goto next_node;
+			}
+			/* check if we need to allocate an http_txn struct for HTTP parsing */
+			/* Note, we may also need to set curpx->to_log with certain fetches */
+			px->http_needed |= http_needed;
+
+			/* FIXME: temporary workaround for missing LW_XPRT and LW_REQ flags
+			 * needed with some sample fetches (eg: ssl*). We always set it for
+			 * now on, but this will leave with sample capabilities soon.
+			 */
+			px->to_log |= LW_XPRT;
+			if (px->http_needed)
+				px->to_log |= LW_REQ;
+		}
+		else if (lf->type == LOG_FMT_ALIAS) {
+			if (lf->alias->mode == PR_MODE_HTTP && px->mode != PR_MODE_HTTP) {
+				memprintf(err, "format alias '%s' is reserved for HTTP mode",
+				          lf->alias->name);
+				goto fail;
+			}
+			if (lf->alias->config_callback &&
+			    !lf->alias->config_callback(lf, px)) {
+				memprintf(err, "cannot configure format alias '%s' in this context",
+				          lf->alias->name);
+				goto fail;
+			}
+			if (!(px->flags & PR_FL_CHECKED))
+				px->to_log |= lf->alias->lw;
+		}
+ next_node:
+		/* postcheck individual node's options */
+		if (!lf_expr_postcheck_node_opt(lf_expr, lf, err))
+			goto fail;
+	}
+	if ((px->to_log & (LW_REQ | LW_RESP)) &&
+	    (px->mode != PR_MODE_HTTP && !(px->options & PR_O_HTTP_UPG))) {
+		memprintf(err, "logformat expression not usable here (at least one node depends on HTTP mode)");
 		goto fail;
 	}
-	free(backfmt);
 
 	return 1;
  fail:
-	free(backfmt);
 	return 0;
 }
 
+/* postparse logformats defined at <px> level */
+static int postcheck_logformat_proxy(struct proxy *px)
+{
+	char *err = NULL;
+	struct lf_expr *lf_expr, *back_lf;
+	int err_code = ERR_NONE;
+
+	list_for_each_entry_safe(lf_expr, back_lf, &px->conf.lf_checks, list) {
+		BUG_ON(!(lf_expr->flags & LF_FL_COMPILED));
+		if (!lf_expr_postcheck(lf_expr, px, &err))
+			err_code |= ERR_FATAL | ERR_ALERT;
+		/* check performed, ensure it doesn't get checked twice */
+		LIST_DEL_INIT(&lf_expr->list);
+		if (err_code & ERR_CODE)
+			break;
+	}
+
+	if (err) {
+		memprintf(&err, "error detected while postparsing logformat expression used by %s '%s' : %s", proxy_type_str(px), px->id, err);
+		if (lf_expr->conf.file)
+			memprintf(&err, "parsing [%s:%d] : %s.\n", lf_expr->conf.file, lf_expr->conf.line, err);
+		ha_alert("%s", err);
+		ha_free(&err);
+	}
+
+	return err_code;
+}
+
 /*
  * Parse the first range of indexes from a string made of a list of comma separated
  * ranges of indexes. Note that an index may be considered as a particular range
@@ -775,110 +1157,6 @@ static int dup_log_target(struct log_target *def, struct log_target *cpy)
 	return 0;
 }
 
-/* must be called under the lbprm lock */
-static void _log_backend_srv_queue(struct server *srv)
-{
-	struct proxy *p = srv->proxy;
-
-	/* queue the server in the proxy lb array to make it easily searchable by
-	 * log-balance algorithms. Here we use the srv array as a general server
-	 * pool of in-use servers, lookup is done using a relative positional id
-	 * (array is contiguous)
-	 *
-	 * We use the avail server list to get a quick hand on available servers
-	 * (those that are UP)
-	 */
-	if (srv->flags & SRV_F_BACKUP) {
-		if (!p->srv_act)
-			p->lbprm.log.srv[p->srv_bck] = srv;
-		p->srv_bck++;
-	}
-	else {
-		if (!p->srv_act) {
-			/* we will be switching to act tree in LB logic, thus we need to
-			 * reset the lastid
-			 */
-			HA_ATOMIC_STORE(&p->lbprm.log.lastid, 0);
-		}
-		p->lbprm.log.srv[p->srv_act] = srv;
-		p->srv_act++;
-	}
-	/* append the server to the list of available servers */
-	LIST_APPEND(&p->lbprm.log.avail, &srv->lb_list);
-
-	p->lbprm.tot_weight = (p->srv_act) ? p->srv_act : p->srv_bck;
-}
-
-static void log_backend_srv_up(struct server *srv)
-{
-	struct proxy *p __maybe_unused = srv->proxy;
-
-	if (!srv_lb_status_changed(srv))
-		return; /* nothing to do */
-	if (srv_currently_usable(srv) || !srv_willbe_usable(srv))
-		return; /* false alarm */
-
-	HA_RWLOCK_WRLOCK(LBPRM_LOCK, &p->lbprm.lock);
-	_log_backend_srv_queue(srv);
-	HA_RWLOCK_WRUNLOCK(LBPRM_LOCK, &p->lbprm.lock);
-}
-
-/* must be called under lbprm lock */
-static void _log_backend_srv_recalc(struct proxy *p)
-{
-	unsigned int it = 0;
-	struct server *cur_srv;
-
-	list_for_each_entry(cur_srv, &p->lbprm.log.avail, lb_list) {
-		uint8_t backup = cur_srv->flags & SRV_F_BACKUP;
-
-		if ((!p->srv_act && backup) ||
-		    (p->srv_act && !backup))
-			p->lbprm.log.srv[it++] = cur_srv;
-	}
-}
-
-/* must be called under the lbprm lock */
-static void _log_backend_srv_dequeue(struct server *srv)
-{
-	struct proxy *p = srv->proxy;
-
-	if (srv->flags & SRV_F_BACKUP) {
-		p->srv_bck--;
-	}
-	else {
-		p->srv_act--;
-		if (!p->srv_act) {
-			/* we will be switching to bck tree in LB logic, thus we need to
-			 * reset the lastid
-			 */
-			HA_ATOMIC_STORE(&p->lbprm.log.lastid, 0);
-		}
-	}
-
-	/* remove the srv from the list of available (UP) servers */
-	LIST_DELETE(&srv->lb_list);
-
-	/* reconstruct the array of usable servers */
-	_log_backend_srv_recalc(p);
-
-	p->lbprm.tot_weight = (p->srv_act) ? p->srv_act : p->srv_bck;
-}
-
-static void log_backend_srv_down(struct server *srv)
-{
-	struct proxy *p __maybe_unused = srv->proxy;
-
-	if (!srv_lb_status_changed(srv))
-		return; /* nothing to do */
-	if (!srv_currently_usable(srv) || srv_willbe_usable(srv))
-		return; /* false alarm */
-
-	HA_RWLOCK_WRLOCK(LBPRM_LOCK, &p->lbprm.lock);
-	_log_backend_srv_dequeue(srv);
-	HA_RWLOCK_WRUNLOCK(LBPRM_LOCK, &p->lbprm.lock);
-}
-
 /* check that current configuration is compatible with "mode log" */
 static int _postcheck_log_backend_compat(struct proxy *be)
 {
@@ -943,8 +1221,11 @@ static int _postcheck_log_backend_compat(struct proxy *be)
 	}
 	if (balance_algo != BE_LB_ALGO_RR &&
 	    balance_algo != BE_LB_ALGO_RND &&
-	    balance_algo != BE_LB_ALGO_LS &&
+	    balance_algo != BE_LB_ALGO_SS &&
 	    balance_algo != BE_LB_ALGO_LH) {
+		/* cannot correct the error since lbprm init was already performed
+		 * in cfgparse.c, so fail loudly
+		 */
 		ha_alert("in %s '%s': \"balance\" only supports 'roundrobin', 'random', 'sticky' and 'log-hash'.\n", proxy_type_str(be), be->id);
 		err_code |= ERR_ALERT | ERR_FATAL;
 	}
@@ -966,30 +1247,6 @@ static int postcheck_log_backend(struct proxy *be)
 	if (err_code & ERR_CODE)
 		return err_code;
 
-	/* First time encountering this log backend, perform some init
-	 */
-	be->lbprm.set_server_status_up = log_backend_srv_up;
-	be->lbprm.set_server_status_down = log_backend_srv_down;
-	be->lbprm.log.lastid = 0; /* initial value */
-	LIST_INIT(&be->lbprm.log.avail);
-
-	/* alloc srv array (it will be used for active and backup server lists in turn,
-	 * so we ensure that the longest list will fit
-	 */
-	be->lbprm.log.srv = calloc(MAX(be->srv_act, be->srv_bck),
-				   sizeof(*be->lbprm.log.srv));
-
-	if (!be->lbprm.log.srv ) {
-		memprintf(&msg, "memory error when allocating server array (%d entries)",
-		          MAX(be->srv_act, be->srv_bck));
-		err_code |= ERR_ALERT | ERR_FATAL;
-		goto end;
-	}
-
-	/* reinit srv counters, lbprm queueing will recount */
-	be->srv_act = 0;
-	be->srv_bck = 0;
-
 	/* "log-balance hash" needs to compile its expression */
 	if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_LH) {
 		struct sample_expr *expr;
@@ -1100,13 +1357,10 @@ static int postcheck_log_backend(struct proxy *be)
 			goto end;
 		}
 		srv->log_target->flags |= LOG_TARGET_FL_RESOLVED;
-		srv->cur_eweight = 1; /* ignore weights, all servers have the same weight */
-		_log_backend_srv_queue(srv);
 		srv = srv->next;
 	}
  end:
 	if (err_code & ERR_CODE) {
-		ha_free(&be->lbprm.log.srv); /* free log servers array */
 		ha_alert("log backend '%s': failed to initialize: %s.\n", be->id, msg);
 		ha_free(&msg);
 	}
@@ -1171,6 +1425,7 @@ struct logger *dup_logger(struct logger *def)
 
 	/* default values */
 	cpy->conf.file = NULL;
+	cpy->lb.smp_rgs = NULL;
 	LIST_INIT(&cpy->list);
 
 	/* special members */
@@ -1181,6 +1436,13 @@ struct logger *dup_logger(struct logger *def)
 		if (!cpy->conf.file)
 			goto error;
 	}
+	if (def->lb.smp_rgs) {
+		cpy->lb.smp_rgs = malloc(sizeof(*cpy->lb.smp_rgs) * def->lb.smp_rgs_sz);
+		if (!cpy->lb.smp_rgs)
+			goto error;
+		memcpy(cpy->lb.smp_rgs, def->lb.smp_rgs,
+		       sizeof(*cpy->lb.smp_rgs) * def->lb.smp_rgs_sz);
+	}
 
 	/* inherit from original reference if set */
 	cpy->ref = (def->ref) ? def->ref : def;
@@ -1204,6 +1466,7 @@ void free_logger(struct logger *logger)
 	BUG_ON(LIST_INLIST(&logger->list));
 	ha_free(&logger->conf.file);
 	deinit_log_target(&logger->target);
+	free(logger->lb.smp_rgs);
 	free(logger);
 }
 
@@ -1564,127 +1827,440 @@ int get_log_facility(const char *fac)
 	return facility;
 }
 
-/*
- * Encode the string.
+struct lf_buildctx {
+	char _buf[256];/* fixed size buffer for building small strings */
+	int options;   /* LOG_OPT_* options */
+	int typecast;  /* same as logformat_node->typecast */
+	int in_text;   /* inside variable-length text */
+	union {
+		struct cbor_encode_ctx cbor; /* cbor-encode specific ctx */
+	} encode;
+};
+
+static THREAD_LOCAL struct lf_buildctx lf_buildctx;
+
+/* helper to encode a single byte in hex form
  *
- * When using the +E log format option, it will try to escape '"\]'
- * characters with '\' as prefix. The same prefix should not be used as
- * <escape>.
+ * Returns the position of the last written byte on success and NULL on
+ * error.
  */
-static char *lf_encode_string(char *start, char *stop,
-                              const char escape, const long *map,
-                              const char *string,
-                              struct logformat_node *node)
+static char *_encode_byte_hex(char *start, char *stop, unsigned char byte)
 {
-	if (node->options & LOG_OPT_ESC) {
-		if (start < stop) {
-			stop--; /* reserve one byte for the final '\0' */
-			while (start < stop && *string != '\0') {
-				if (!ha_bit_test((unsigned char)(*string), map)) {
-					if (!ha_bit_test((unsigned char)(*string), rfc5424_escape_map))
-						*start++ = *string;
-					else {
-						if (start + 2 >= stop)
-							break;
-						*start++ = '\\';
-						*start++ = *string;
-					}
-				}
-				else {
-					if (start + 3 >= stop)
-						break;
-					*start++ = escape;
-					*start++ = hextab[(*string >> 4) & 15];
-					*start++ = hextab[*string & 15];
-				}
-				string++;
-			}
-			*start = '\0';
-		}
+	/* hex form requires 2 bytes */
+	if ((stop - start) < 2)
+		return NULL;
+	*start++ = hextab[(byte >> 4) & 15];
+	*start++ = hextab[byte & 15];
+	return start;
+}
+
+/* lf cbor function ptr used to encode a single byte according to RFC8949
+ *
+ * for now only hex form is supported.
+ *
+ * The function may only be called under CBOR context (that is when
+ * LOG_OPT_ENCODE_CBOR option is set).
+ *
+ * Returns the position of the last written byte on success and NULL on
+ * error.
+ */
+static char *_lf_cbor_encode_byte(struct cbor_encode_ctx *cbor_ctx,
+                                  char *start, char *stop, unsigned char byte)
+{
+	struct lf_buildctx *ctx;
+
+	BUG_ON(!cbor_ctx || !cbor_ctx->e_fct_ctx);
+	ctx = cbor_ctx->e_fct_ctx;
+
+	if (ctx->options & LOG_OPT_BIN) {
+		/* raw output */
+		if ((stop - start) < 1)
+			return NULL;
+		*start++ = byte;
+		return start;
+	}
+	return _encode_byte_hex(start, stop, byte);
+}
+
+/* helper function to prepare lf_buildctx struct based on global options
+ * and current node settings (may be NULL)
+ */
+static inline void lf_buildctx_prepare(struct lf_buildctx *ctx,
+                                       int g_options,
+                                       const struct logformat_node *node)
+{
+	if (node) {
+		/* consider node's options and typecast setting */
+		ctx->options = node->options;
+		ctx->typecast = node->typecast;
 	}
 	else {
-		return encode_string(start, stop, escape, map, string);
+		ctx->options = g_options;
+		ctx->typecast = SMP_T_SAME; /* default */
+	}
+
+	if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		/* prepare cbor-specific encode ctx */
+		ctx->encode.cbor.e_fct_byte = _lf_cbor_encode_byte;
+		ctx->encode.cbor.e_fct_ctx = ctx;
+	}
+}
+
+/* helper function for _lf_encode_bytes() to escape a single byte
+ * with <escape>
+ */
+static inline char *_lf_escape_byte(char *start, char *stop,
+                                    char byte, const char escape)
+{
+	if (start + 3 >= stop)
+		return NULL;
+	*start++ = escape;
+	*start++ = hextab[(byte >> 4) & 15];
+	*start++ = hextab[byte & 15];
+
+	return start;
+}
+
+/* helper function for _lf_encode_bytes() to escape a single byte
+ * with <escape> and deal with cbor-specific encoding logic
+ */
+static inline char *_lf_cbor_escape_byte(char *start, char *stop,
+                                         char byte, const char escape,
+                                         uint8_t cbor_string_prefix,
+                                         struct lf_buildctx *ctx)
+{
+	char escaped_byte[3];
+
+	escaped_byte[0] = escape;
+	escaped_byte[1] = hextab[(byte >> 4) & 15];
+	escaped_byte[2] = hextab[byte & 15];
+
+	start = cbor_encode_bytes_prefix(&ctx->encode.cbor, start, stop,
+	                                 escaped_byte, 3,
+	                                 cbor_string_prefix);
+
+	return start;
+}
+
+/* helper function for _lf_encode_bytes() to encode a single byte
+ * and escape it with <escape> if found in <map>
+ *
+ * The function assumes that at least 1 byte is available for writing
+ *
+ * Returns the address of the last written byte on success, or NULL
+ * on error
+ */
+static inline char *_lf_map_escape_byte(char *start, char *stop,
+                                        const char *byte,
+                                        const char escape, const long *map,
+                                        const char **pending, uint8_t cbor_string_prefix,
+                                        struct lf_buildctx *ctx)
+{
+	if (!ha_bit_test((unsigned char)(*byte), map))
+		*start++ = *byte;
+	else
+		start = _lf_escape_byte(start, stop, *byte, escape);
+
+	return start;
+}
+
+/* helper function for _lf_encode_bytes() to encode a single byte
+ * and escape it with <escape> if found in <map> and deal with
+ * cbor-specific encoding logic.
+ *
+ * The function assumes that at least 1 byte is available for writing
+ *
+ * Returns the address of the last written byte on success, or NULL
+ * on error
+ */
+static inline char *_lf_cbor_map_escape_byte(char *start, char *stop,
+                                             const char *byte,
+                                             const char escape, const long *map,
+                                             const char **pending, uint8_t cbor_string_prefix,
+                                             struct lf_buildctx *ctx)
+{
+	/* We try our best to minimize the number of chunks produced for the
+	 * indefinite-length byte string as each chunk has an extra overhead
+	 * as per RFC8949.
+	 *
+	 * To achieve that, we try to emit consecutive bytes together
+	 */
+	if (!ha_bit_test((unsigned char)(*byte), map)) {
+		/* do nothing and let the caller continue seeking data,
+		 * pending data will be flushed later
+		 */
+	} else {
+		/* first, flush pending unescaped bytes */
+		start = cbor_encode_bytes_prefix(&ctx->encode.cbor, start, stop,
+		                                 *pending, (byte - *pending),
+		                                 cbor_string_prefix);
+		if (start == NULL)
+			return NULL;
+
+		*pending = byte + 1;
+
+		/* escape current matching byte */
+		start = _lf_cbor_escape_byte(start, stop, *byte, escape,
+		                             cbor_string_prefix,
+		                             ctx);
+	}
+
+	return start;
+}
+
+/* helper function for _lf_encode_bytes() to encode a single byte
+ * and escape it with <escape> if found in <map> or escape it with
+ * '\' if found in rfc5424_escape_map
+ *
+ * The function assumes that at least 1 byte is available for writing
+ *
+ * Returns the address of the last written byte on success, or NULL
+ * on error
+ */
+static inline char *_lf_rfc5424_escape_byte(char *start, char *stop,
+                                            const char *byte,
+                                            const char escape, const long *map,
+                                            const char **pending, uint8_t cbor_string_prefix,
+                                            struct lf_buildctx *ctx)
+{
+	if (!ha_bit_test((unsigned char)(*byte), map)) {
+		if (!ha_bit_test((unsigned char)(*byte), rfc5424_escape_map))
+			*start++ = *byte;
+		else {
+			if (start + 2 >= stop)
+				return NULL;
+			*start++ = '\\';
+			*start++ = *byte;
+		}
+	}
+	else
+		start = _lf_escape_byte(start, stop, *byte, escape);
+
+	return start;
+}
+
+/* helper function for _lf_encode_bytes() to encode a single byte
+ * and escape it with <escape> if found in <map> or escape it with
+ * '\' if found in json_escape_map
+ *
+ * The function assumes that at least 1 byte is available for writing
+ *
+ * Returns the address of the last written byte on success, or NULL
+ * on error
+ */
+static inline char *_lf_json_escape_byte(char *start, char *stop,
+                                         const char *byte,
+                                         const char escape, const long *map,
+                                         const char **pending, uint8_t cbor_string_prefix,
+                                         struct lf_buildctx *ctx)
+{
+	if (!ha_bit_test((unsigned char)(*byte), map)) {
+		if (!ha_bit_test((unsigned char)(*byte), json_escape_map))
+			*start++ = *byte;
+		else {
+			if (start + 2 >= stop)
+				return NULL;
+			*start++ = '\\';
+			*start++ = *byte;
+		}
 	}
+	else
+		start = _lf_escape_byte(start, stop, *byte, escape);
 
 	return start;
 }
 
 /*
- * Encode the chunk.
+ * helper for lf_encode_{string,chunk}:
+ * encode the input bytes, input <bytes> is processed until <bytes_stop>
+ * is reached. If <bytes_stop> is NULL, <bytes> is expected to be NULL
+ * terminated.
  *
  * When using the +E log format option, it will try to escape '"\]'
  * characters with '\' as prefix. The same prefix should not be used as
  * <escape>.
+ *
+ * When using json encoding, string will be escaped according to
+ * json escape map
+ *
+ * When using cbor encoding, escape option is ignored. However bytes found
+ * in <map> will still be escaped with <escape>.
+ *
+ * Return the address of the \0 character, or NULL on error
  */
-static char *lf_encode_chunk(char *start, char *stop,
-                             const char escape, const long *map,
-                             const struct buffer *chunk,
-                             struct logformat_node *node)
+static char *_lf_encode_bytes(char *start, char *stop,
+                              const char escape, const long *map,
+                              const char *bytes, const char *bytes_stop,
+                              struct lf_buildctx *ctx)
 {
-	char *str, *end;
-
-	if (node->options & LOG_OPT_ESC) {
-		if (start < stop) {
-			str = chunk->area;
-			end = chunk->area + chunk->data;
-
-			stop--; /* reserve one byte for the final '\0' */
-			while (start < stop && str < end) {
-				if (!ha_bit_test((unsigned char)(*str), map)) {
-					if (!ha_bit_test((unsigned char)(*str), rfc5424_escape_map))
-						*start++ = *str;
-					else {
-						if (start + 2 >= stop)
-							break;
-						*start++ = '\\';
-						*start++ = *str;
-					}
-				}
-				else {
-					if (start + 3 >= stop)
-						break;
-					*start++ = escape;
-					*start++ = hextab[(*str >> 4) & 15];
-					*start++ = hextab[*str & 15];
-				}
-				str++;
-			}
-			*start = '\0';
+	char *ret;
+	const char *pending;
+	uint8_t cbor_string_prefix = 0;
+	char *(*encode_byte)(char *start, char *stop,
+	                     const char *byte,
+	                     const char escape, const long *map,
+	                     const char **pending, uint8_t cbor_string_prefix,
+	                     struct lf_buildctx *ctx);
+
+	if (ctx->options & LOG_OPT_ENCODE_JSON)
+		encode_byte = _lf_json_escape_byte;
+	else if (ctx->options & LOG_OPT_ENCODE_CBOR)
+		encode_byte = _lf_cbor_map_escape_byte;
+	else if (ctx->options & LOG_OPT_ESC)
+		encode_byte = _lf_rfc5424_escape_byte;
+	else
+		encode_byte = _lf_map_escape_byte;
+
+	if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		if (!bytes_stop) {
+			/* printable chars: use cbor text */
+			cbor_string_prefix = 0x60;
+		}
+		else {
+			/* non printable chars: use cbor byte string */
+			cbor_string_prefix = 0x40;
 		}
 	}
-	else {
-		return encode_chunk(start, stop, escape, map, chunk);
+
+	if (start < stop) {
+		stop--; /* reserve one byte for the final '\0' */
+
+		if ((ctx->options & LOG_OPT_ENCODE_CBOR) && !ctx->in_text) {
+			/* start indefinite-length cbor byte string or text */
+			start = _lf_cbor_encode_byte(&ctx->encode.cbor, start, stop,
+			                             (cbor_string_prefix | 0x1F));
+			if (start == NULL)
+				return NULL;
+		}
+		pending = bytes;
+
+		/* we have 2 distinct loops to keep checks outside of the loop
+		 * for better performance
+		 */
+		if (bytes && !bytes_stop) {
+			while (start < stop && *bytes != '\0') {
+				ret = encode_byte(start, stop, bytes, escape, map,
+				                  &pending, cbor_string_prefix,
+				                  ctx);
+				if (ret == NULL)
+					break;
+				start = ret;
+				bytes++;
+			}
+		} else if (bytes) {
+			while (start < stop && bytes < bytes_stop) {
+				ret = encode_byte(start, stop, bytes, escape, map,
+				                  &pending, cbor_string_prefix,
+				                  ctx);
+				if (ret == NULL)
+					break;
+				start = ret;
+				bytes++;
+			}
+		}
+
+		if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+			if (pending != bytes) {
+				/* flush pending unescaped bytes */
+				start = cbor_encode_bytes_prefix(&ctx->encode.cbor, start, stop,
+				                                 pending, (bytes - pending),
+				                                 cbor_string_prefix);
+				if (start == NULL)
+					return NULL;
+			}
+			if (!ctx->in_text) {
+				/* cbor break (to end indefinite-length text or byte string) */
+				start = _lf_cbor_encode_byte(&ctx->encode.cbor, start, stop, 0xFF);
+				if (start == NULL)
+					return NULL;
+			}
+		}
+
+		*start = '\0';
+		return start;
 	}
 
-	return start;
+	return NULL;
 }
 
 /*
- * Write a string in the log string
- * Take cares of quote and escape options
+ * Encode the string.
+ */
+static char *lf_encode_string(char *start, char *stop,
+                              const char escape, const long *map,
+                              const char *string,
+                              struct lf_buildctx *ctx)
+{
+	return _lf_encode_bytes(start, stop, escape, map,
+	                        string, NULL, ctx);
+}
+
+/*
+ * Encode the chunk.
+ */
+static char *lf_encode_chunk(char *start, char *stop,
+                             const char escape, const long *map,
+                             const struct buffer *chunk,
+                             struct lf_buildctx *ctx)
+{
+	return _lf_encode_bytes(start, stop, escape, map,
+	                        chunk->area, chunk->area + chunk->data,
+	                        ctx);
+}
+
+/*
+ * Write a raw string in the log string
+ * Take care of escape option
+ *
+ * When using json encoding, string will be escaped according
+ * to json escape map
+ *
+ * When using cbor encoding, escape option is ignored.
  *
  * Return the address of the \0 character, or NULL on error
  */
-char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const struct logformat_node *node)
+static inline char *_lf_text_len(char *dst, const char *src,
+                                 size_t len, size_t size, struct lf_buildctx *ctx)
 {
-	if (size < 2)
-		return NULL;
+	const long *escape_map = NULL;
+	char *ret;
 
-	if (node->options & LOG_OPT_QUOTE) {
-		*(dst++) = '"';
-		size--;
-	}
+	if (ctx->options & LOG_OPT_ENCODE_JSON)
+		escape_map = json_escape_map;
+	else if (ctx->options & LOG_OPT_ESC)
+		escape_map = rfc5424_escape_map;
 
 	if (src && len) {
+		if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+			/* it's actually less costly to compute the actual text size to
+			 * write a single fixed length text at once rather than emitting
+			 * indefinite length text in cbor, because indefinite-length text
+			 * has to be made of multiple chunks of known size as per RFC8949...
+			 */
+			{
+				int _len;
+
+				/* strnlen(src, len) portable equivalent: */
+				for (_len = 0; _len < len && src[_len]; _len++)
+					;
+
+				len = _len;
+			}
+
+			ret = cbor_encode_text(&ctx->encode.cbor, dst, dst + size, src, len);
+			if (ret == NULL)
+				return NULL;
+			len = ret - dst;
+		}
+
 		/* escape_string and strlcpy2 will both try to add terminating NULL-byte
-		 * to dst, so we need to make sure that extra byte will fit into dst
-		 * before calling them
+		 * to dst
 		 */
-		if (node->options & LOG_OPT_ESC) {
+		else if (escape_map) {
 			char *ret;
 
-			ret = escape_string(dst, (dst + size - 1), '\\', rfc5424_escape_map, src, src + len);
-			if (ret == NULL || *ret != '\0')
+			ret = escape_string(dst, dst + size, '\\', escape_map, src, src + len);
+			if (ret == NULL)
 				return NULL;
 			len = ret - dst;
 		}
@@ -1692,90 +2268,276 @@ char *lf_text_len(char *dst, const char *src, size_t len, size_t size, const str
 			if (++len > size)
 				len = size;
 			len = strlcpy2(dst, src, len);
+			if (len == 0)
+				return NULL;
 		}
-
-		size -= len;
 		dst += len;
+		size -= len;
 	}
-	else if ((node->options & (LOG_OPT_QUOTE|LOG_OPT_MANDATORY)) == LOG_OPT_MANDATORY) {
-		if (size < 2)
-			return NULL;
-		*(dst++) = '-';
-		size -= 1;
-	}
 
-	if (node->options & LOG_OPT_QUOTE) {
-		if (size < 2)
+	if (size < 1)
+		return NULL;
+	*dst = '\0';
+
+	return dst;
+}
+
+/*
+ * Quote a string, then leverage _lf_text_len() to write it
+ */
+static inline char *_lf_quotetext_len(char *dst, const char *src,
+                                      size_t len, size_t size, struct lf_buildctx *ctx)
+{
+	if (size < 2)
+		return NULL;
+
+	*(dst++) = '"';
+	size--;
+
+	if (src && len) {
+		char *ret;
+
+		ret = _lf_text_len(dst, src, len, size, ctx);
+		if (ret == NULL)
 			return NULL;
-		*(dst++) = '"';
+		size -= (ret - dst);
+		dst += (ret - dst);
 	}
 
+	if (size < 2)
+		return NULL;
+	*(dst++) = '"';
+
+	*dst = '\0';
+	return dst;
+}
+
+/*
+ * Write a string in the log string
+ * Take care of quote, mandatory and escape and encoding options
+ *
+ * Return the address of the \0 character, or NULL on error
+ */
+static char *lf_text_len(char *dst, const char *src, size_t len, size_t size, struct lf_buildctx *ctx)
+{
+	if ((ctx->options & (LOG_OPT_QUOTE | LOG_OPT_ENCODE_JSON)))
+		return _lf_quotetext_len(dst, src, len, size, ctx);
+	else if ((ctx->options & LOG_OPT_ENCODE_CBOR) ||
+	         (src && len))
+		return _lf_text_len(dst, src, len, size, ctx);
+
+	if (size < 2)
+		return NULL;
+
+	if ((ctx->options & LOG_OPT_MANDATORY))
+		return _lf_text_len(dst, "-", 1, size, ctx);
+
 	*dst = '\0';
+
 	return dst;
 }
 
-static inline char *lf_text(char *dst, const char *src, size_t size, const struct logformat_node *node)
+/*
+ * Same as lf_text_len() except that it ignores mandatory and quoting options.
+ * Quoting is only performed when strictly required by the encoding method.
+ */
+static char *lf_rawtext_len(char *dst, const char *src, size_t len, size_t size, struct lf_buildctx *ctx)
+{
+	if (!ctx->in_text &&
+	    (ctx->options & LOG_OPT_ENCODE_JSON))
+		return _lf_quotetext_len(dst, src, len, size, ctx);
+	return _lf_text_len(dst, src, len, size, ctx);
+}
+
+/* lf_text_len() helper when <src> is null-byte terminated */
+static inline char *lf_text(char *dst, const char *src, size_t size, struct lf_buildctx *ctx)
 {
-	return lf_text_len(dst, src, size, size, node);
+	return lf_text_len(dst, src, size, size, ctx);
+}
+
+/* lf_rawtext_len() helper when <src> is null-byte terminated */
+static inline char *lf_rawtext(char *dst, const char *src, size_t size, struct lf_buildctx *ctx)
+{
+	return lf_rawtext_len(dst, src, size, size, ctx);
 }
 
 /*
  * Write a IP address to the log string
  * +X option write in hexadecimal notation, most significant byte on the left
  */
-char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
+static char *lf_ip(char *dst, const struct sockaddr *sockaddr, size_t size, struct lf_buildctx *ctx)
 {
 	char *ret = dst;
 	int iret;
 	char pn[INET6_ADDRSTRLEN];
 
-	if (node->options & LOG_OPT_HEXA) {
+	if (ctx->options & LOG_OPT_HEXA) {
 		unsigned char *addr = NULL;
 		switch (sockaddr->sa_family) {
 		case AF_INET:
+		{
 			addr = (unsigned char *)&((struct sockaddr_in *)sockaddr)->sin_addr.s_addr;
-			iret = snprintf(dst, size, "%02X%02X%02X%02X", addr[0], addr[1], addr[2], addr[3]);
+			iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%02X%02X%02X%02X",
+			                addr[0], addr[1], addr[2], addr[3]);
+			if (iret < 0 || iret >= size)
+				return NULL;
+			ret = lf_rawtext(dst, ctx->_buf, size, ctx);
+
 			break;
+		}
 		case AF_INET6:
+		{
 			addr = (unsigned char *)&((struct sockaddr_in6 *)sockaddr)->sin6_addr.s6_addr;
-			iret = snprintf(dst, size, "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
-			                addr[0], addr[1], addr[2], addr[3], addr[4], addr[5], addr[6], addr[7],
-			                addr[8], addr[9], addr[10], addr[11], addr[12], addr[13], addr[14], addr[15]);
+			iret = snprintf(ctx->_buf, sizeof(ctx->_buf),
+			                "%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X%02X",
+			                addr[0], addr[1], addr[2], addr[3],
+			                addr[4], addr[5], addr[6], addr[7],
+			                addr[8], addr[9], addr[10], addr[11],
+			                addr[12], addr[13], addr[14], addr[15]);
+			if (iret < 0 || iret >= size)
+				return NULL;
+			ret = lf_rawtext(dst, ctx->_buf, size, ctx);
+
 			break;
+		}
 		default:
 			return NULL;
 		}
-		if (iret < 0 || iret > size)
-			return NULL;
-		ret += iret;
 	} else {
 		addr_to_str((struct sockaddr_storage *)sockaddr, pn, sizeof(pn));
-		ret = lf_text(dst, pn, size, node);
-		if (ret == NULL)
-			return NULL;
+		ret = lf_text(dst, pn, size, ctx);
 	}
 	return ret;
 }
 
+/* Logformat expr wrapper to write a boolean according to node
+ * encoding settings
+ */
+static char *lf_bool_encode(char *dst, size_t size, uint8_t value,
+                            struct lf_buildctx *ctx)
+{
+	/* encode as a regular bool value */
+
+	if (ctx->options & LOG_OPT_ENCODE_JSON) {
+		char *ret = dst;
+		int iret;
+
+		if (value)
+			iret = snprintf(dst, size, "true");
+		else
+			iret = snprintf(dst, size, "false");
+
+		if (iret < 0 || iret >= size)
+			return NULL;
+		ret += iret;
+		return ret;
+	}
+	if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		if (value)
+			return _lf_cbor_encode_byte(&ctx->encode.cbor, dst, dst + size, 0xF5);
+		return _lf_cbor_encode_byte(&ctx->encode.cbor, dst, dst + size, 0xF4);
+	}
+
+	return NULL; /* not supported */
+}
+
+/* Logformat expr wrapper to write an integer according to node
+ * encoding settings and typecast settings.
+ */
+static char *lf_int_encode(char *dst, size_t size, int64_t value,
+                           struct lf_buildctx *ctx)
+{
+	if (ctx->typecast == SMP_T_BOOL) {
+		/* either true or false */
+		return lf_bool_encode(dst, size, !!value, ctx);
+	}
+
+	if (ctx->options & LOG_OPT_ENCODE_JSON) {
+		char *ret = dst;
+		int iret = 0;
+
+		if (ctx->typecast == SMP_T_STR) {
+			/* encode as a string number (base10 with "quotes"):
+			 *   may be useful to work around the limited resolution
+			 *   of JS number types for instance
+			 */
+			iret = snprintf(dst, size, "\"%lld\"", (long long int)value);
+		}
+		else {
+			/* encode as a regular int64 number (base10) */
+			iret = snprintf(dst, size, "%lld", (long long int)value);
+		}
+
+		if (iret < 0 || iret >= size)
+			return NULL;
+		ret += iret;
+
+		return ret;
+	}
+	else if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		/* Always print as a regular int64 number (STR typecast isn't
+		 * supported)
+		 */
+		return cbor_encode_int64(&ctx->encode.cbor, dst, dst + size, value);
+	}
+
+	return NULL; /* not supported */
+}
+
+enum lf_int_hdl {
+	LF_INT_LTOA = 0,
+	LF_INT_LLTOA,
+	LF_INT_ULTOA,
+	LF_INT_UTOA_PAD_4,
+};
+
+/*
+ * Logformat expr wrapper to write an integer, uses <dft_hdl> to know
+ * how to encode the value by default (if no encoding is used)
+ */
+static inline char *lf_int(char *dst, size_t size, int64_t value,
+                           struct lf_buildctx *ctx,
+                           enum lf_int_hdl dft_hdl)
+{
+	if (ctx->options & LOG_OPT_ENCODE)
+		return lf_int_encode(dst, size, value, ctx);
+
+	switch (dft_hdl) {
+		case LF_INT_LTOA:
+			return ltoa_o(value, dst, size);
+		case LF_INT_LLTOA:
+			return lltoa(value, dst, size);
+		case LF_INT_ULTOA:
+			return ultoa_o(value, dst, size);
+		case LF_INT_UTOA_PAD_4:
+		{
+			if (size < 4)
+				return NULL;
+			return utoa_pad(value, dst, 4);
+		}
+	}
+	return NULL;
+}
+
 /*
  * Write a port to the log
  * +X option write in hexadecimal notation, most significant byte on the left
  */
-char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, const struct logformat_node *node)
+static char *lf_port(char *dst, const struct sockaddr *sockaddr, size_t size, struct lf_buildctx *ctx)
 {
 	char *ret = dst;
 	int iret;
 
-	if (node->options & LOG_OPT_HEXA) {
+	if (ctx->options & LOG_OPT_HEXA) {
 		const unsigned char *port = (const unsigned char *)&((struct sockaddr_in *)sockaddr)->sin_port;
-		iret = snprintf(dst, size, "%02X%02X", port[0], port[1]);
-		if (iret < 0 || iret > size)
+
+		iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%02X%02X", port[0], port[1]);
+		if (iret < 0 || iret >= size)
 			return NULL;
-		ret += iret;
+		ret = lf_rawtext(dst, ctx->_buf, size, ctx);
 	} else {
-		ret = ltoa_o(get_host_port((struct sockaddr_storage *)sockaddr), dst, size);
-		if (ret == NULL)
-			return NULL;
+		ret = lf_int(dst, size, get_host_port((struct sockaddr_storage *)sockaddr),
+		             ctx, LF_INT_LTOA);
 	}
 	return ret;
 }
@@ -2255,51 +3017,25 @@ static inline void __do_send_log_backend(struct proxy *be, struct log_header hdr
                                          int nblogger, size_t maxlen,
                                          char *message, size_t size)
 {
-	struct server *srv;
-	uint32_t targetid = ~0; /* default value to check if it was explicitly assigned */
-	uint32_t nb_srv;
-
-	HA_RWLOCK_RDLOCK(LBPRM_LOCK, &be->lbprm.lock);
-
-	if (be->srv_act) {
-		nb_srv = be->srv_act;
-	}
-	else if (be->srv_bck) {
-		/* no more active servers but backup ones are, switch to backup farm */
-		nb_srv = be->srv_bck;
-		if (!(be->options & PR_O_USE_ALL_BK)) {
-			/* log balancing disabled on backup farm */
-			targetid = 0; /* use first server */
-			goto skip_lb;
-		}
-	}
-	else {
-		/* no srv available, can't log */
-		goto drop;
-	}
+	struct server *srv = NULL;
 
 	/* log-balancing logic: */
 
 	if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_RR) {
-		/* Atomically load and update lastid since it's not protected
-		 * by any write lock
-		 *
-		 * Wrapping is expected and could lead to unexpected ID reset in the
-		 * middle of a cycle, but given that this only happens once in every
-		 * 4 billions it is quite negligible
-		 */
-		targetid = HA_ATOMIC_FETCH_ADD(&be->lbprm.log.lastid, 1) % nb_srv;
+		srv = fwrr_get_next_server(be, NULL);
 	}
-	else if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_LS) {
+	else if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_SS) {
 		/* sticky mode: use first server in the pool, which will always stay
 		 * first during dequeuing and requeuing, unless it becomes unavailable
 		 * and will be replaced by another one
 		 */
-		targetid = 0;
+		srv = ss_get_server(be);
 	}
 	else if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_RND) {
-		/* random mode */
-		targetid = statistical_prng() % nb_srv;
+		unsigned int hash;
+
+		hash = statistical_prng(); /* random */
+		srv = chash_get_server_hash(be, hash, NULL);
 	}
 	else if ((be->lbprm.algo & BE_LB_ALGO) == BE_LB_ALGO_LH) {
 		struct sample result;
@@ -2314,28 +3050,24 @@ static inline void __do_send_log_backend(struct proxy *be, struct log_header hdr
 		if (sample_process_cnv(be->lbprm.expr, &result)) {
 			/* gen_hash takes binary input, ensure that we provide such value to it */
 			if (result.data.type == SMP_T_BIN || sample_casts[result.data.type][SMP_T_BIN]) {
+				unsigned int hash;
+
 				sample_casts[result.data.type][SMP_T_BIN](&result);
-				targetid = gen_hash(be, result.data.u.str.area, result.data.u.str.data) % nb_srv;
+				hash = gen_hash(be, result.data.u.str.area, result.data.u.str.data);
+				srv = map_get_server_hash(be, hash);
 			}
 		}
 	}
 
- skip_lb:
-
-	if (targetid == ~0) {
-		/* no target assigned, nothing to do */
+	if (!srv) {
+		/* no srv available, can't log */
 		goto drop;
 	}
 
-	/* find server based on targetid */
-	srv = be->lbprm.log.srv[targetid];
-	HA_RWLOCK_RDUNLOCK(LBPRM_LOCK, &be->lbprm.lock);
-
 	__do_send_log(srv->log_target, hdr, nblogger, maxlen, message, size);
 	return;
 
  drop:
-	HA_RWLOCK_RDUNLOCK(LBPRM_LOCK, &be->lbprm.lock);
 	_HA_ATOMIC_INC(&dropped_logs);
 }
 
@@ -2347,7 +3079,7 @@ static inline void __do_send_log_backend(struct proxy *be, struct log_header hdr
  * data to build the header.
  */
 void process_send_log(struct list *loggers, int level, int facility,
-	                struct ist *metadata, char *message, size_t size)
+                      struct ist *metadata, char *message, size_t size)
 {
 	struct logger *logger;
 	int nblogger;
@@ -2463,16 +3195,131 @@ const char sess_set_cookie[8] = "NPDIRU67";	/* No set-cookie, Set-cookie found a
 						   Set-cookie Updated, unknown, unknown */
 
 /*
+ * try to write a cbor byte if there is enough space, or goto out
+ */
+#define LOG_CBOR_BYTE(x) do {                                          \
+			ret = _lf_cbor_encode_byte(&ctx->encode.cbor,  \
+			                           tmplog,             \
+			                           dst + maxsize,      \
+			                           (x));               \
+			if (ret == NULL)                               \
+				goto out;                              \
+			tmplog = ret;                                  \
+		} while (0)
+
+/*
  * try to write a character if there is enough space, or goto out
  */
 #define LOGCHAR(x) do { \
-			if (tmplog < dst + maxsize - 1) { \
-				*(tmplog++) = (x);                     \
-			} else {                                       \
-				goto out;                              \
-			}                                              \
+			if ((ctx->options & LOG_OPT_ENCODE_CBOR) &&            \
+			    ctx->in_text) {                                    \
+				char _x[1];                                    \
+				/* encode the char as text chunk since we      \
+				 * cannot just throw random bytes and expect   \
+				 * cbor decoder to know how to handle them     \
+				 */                                            \
+				_x[0] = (x);                                   \
+				ret = cbor_encode_text(&ctx->encode.cbor,      \
+				                       tmplog,                 \
+				                       dst + maxsize,          \
+				                       _x, sizeof(_x));        \
+				if (ret == NULL)                               \
+					goto out;                              \
+				tmplog = ret;                                  \
+				break;                                         \
+			}                                                      \
+			if (tmplog < dst + maxsize - 1) {                      \
+				*(tmplog++) = (x);                             \
+			} else {                                               \
+				goto out;                                      \
+			}                                                      \
 		} while(0)
 
+/* indicate that a new variable-length text is starting, sets in_text
+ * variable to indicate that a var text was started and deals with
+ * encoding and options to know if some special treatment is needed.
+ */
+#define LOG_VARTEXT_START() do {                                               \
+			ctx->in_text = 1;                                      \
+			if (ctx->options & LOG_OPT_ENCODE_CBOR) {              \
+				/* start indefinite-length cbor text */        \
+				LOG_CBOR_BYTE(0x7F);                           \
+				break;                                         \
+			}                                                      \
+			/* put the text within quotes if JSON encoding         \
+			 * is used or quoting is enabled                       \
+			 */                                                    \
+			if (ctx->options &                                     \
+			    (LOG_OPT_QUOTE | LOG_OPT_ENCODE_JSON)) {           \
+				LOGCHAR('"');                                  \
+			}                                                      \
+		} while (0)
+
+/* properly finish a variable text that was started using LOG_VARTEXT_START
+ * checks the in_text variable to know if a text was started or not, and
+ * deals with encoding and options to know if some special treatment is
+ * needed.
+ */
+#define LOG_VARTEXT_END() do {                                                 \
+			if (!ctx->in_text)                                     \
+				break;                                         \
+			ctx->in_text = 0;                                      \
+			if (ctx->options & LOG_OPT_ENCODE_CBOR) {              \
+				/* end indefinite-length cbor text with break*/\
+				LOG_CBOR_BYTE(0xFF);                           \
+				break;                                         \
+			}                                                      \
+			/* add the ending quote if JSON encoding is            \
+			 * used or quoting is enabled                          \
+			 */                                                    \
+			if (ctx->options &                                     \
+			    (LOG_OPT_QUOTE | LOG_OPT_ENCODE_JSON)) {           \
+				LOGCHAR('"');                                  \
+			}                                                      \
+		} while (0)
+
+/* Prints additional logvalue hint represented by <chr>.
+ * It is useful to express that <chr> is not part of the "raw" value and
+ * should be considered as optional metadata instead.
+ */
+#define LOGMETACHAR(chr) do {                                          \
+			/* ignored when encoding is used */            \
+			if (ctx->options & LOG_OPT_ENCODE)             \
+				break;                                 \
+			LOGCHAR(chr);                                  \
+		} while (0)
+
+/* indicate the start of a string array */
+#define LOG_STRARRAY_START() do {                                      \
+			if (ctx->options & LOG_OPT_ENCODE_JSON)        \
+				LOGCHAR('[');                          \
+			if (ctx->options & LOG_OPT_ENCODE_CBOR) {      \
+				/* start indefinite-length array */    \
+				LOG_CBOR_BYTE(0x9F);                   \
+			}                                              \
+		} while (0)
+
+/* indicate that a new element is added to the string array */
+#define LOG_STRARRAY_NEXT() do {                                       \
+			if (ctx->options & LOG_OPT_ENCODE_CBOR)        \
+				break;                                 \
+			if (ctx->options & LOG_OPT_ENCODE_JSON) {      \
+				LOGCHAR(',');                          \
+				LOGCHAR(' ');                          \
+			}                                              \
+			else                                           \
+				LOGCHAR(' ');                          \
+		} while (0)
+
+/* indicate the end of a string array */
+#define LOG_STRARRAY_END() do {                                        \
+			if (ctx->options & LOG_OPT_ENCODE_JSON)        \
+				LOGCHAR(']');                          \
+			if (ctx->options & LOG_OPT_ENCODE_CBOR) {      \
+				/* cbor break */                       \
+				LOG_CBOR_BYTE(0xFF);                   \
+			}                                              \
+		} while (0)
 
 /* Initializes some log data at boot */
 static void init_log()
@@ -2480,6 +3327,9 @@ static void init_log()
 	char *tmp;
 	int i;
 
+	/* Initialize the no escape map, which may be used to bypass escaping */
+	memset(no_escape_map, 0, sizeof(no_escape_map));
+
 	/* Initialize the escape map for the RFC5424 structured-data : '"\]'
 	 * inside PARAM-VALUE should be escaped with '\' as prefix.
 	 * See https://tools.ietf.org/html/rfc5424#section-6.3.3 for more
@@ -2493,6 +3343,15 @@ static void init_log()
 		tmp++;
 	}
 
+	/* Initialize the escape map for JSON strings : '"\' */
+	memset(json_escape_map, 0, sizeof(json_escape_map));
+
+	tmp = "\"\\";
+	while (*tmp) {
+		ha_bit_set(*tmp, json_escape_map);
+		tmp++;
+	}
+
 	/* initialize the log header encoding map : '{|}"#' should be encoded with
 	 * '#' as prefix, as well as non-printable characters ( <32 or >= 127 ).
 	 * URL encoding only requires '"', '#' to be encoded as well as non-
@@ -2583,19 +3442,133 @@ void deinit_log_forward()
 	}
 }
 
-/* Builds a log line in <dst> based on <list_format>, and stops before reaching
+/* Releases memory for a single log-format node */
+void free_logformat_node(struct logformat_node *node)
+{
+	if (!node)
+		return;
+
+	release_sample_expr(node->expr);
+	node->expr = NULL;
+	ha_free(&node->name);
+	ha_free(&node->arg);
+	ha_free(&node);
+}
+
+/* Releases memory allocated for a log-format string */
+void free_logformat_list(struct list *fmt)
+{
+	struct logformat_node *lf, *lfb;
+
+	if ((fmt == NULL) || LIST_ISEMPTY(fmt))
+		return;
+
+	list_for_each_entry_safe(lf, lfb, fmt, list) {
+		LIST_DELETE(&lf->list);
+		free_logformat_node(lf);
+	}
+}
+
+/* Prepares log-format expression struct */
+void lf_expr_init(struct lf_expr *expr)
+{
+	LIST_INIT(&expr->list);
+	expr->flags = LF_FL_NONE;
+	expr->str = NULL;
+	expr->conf.file = NULL;
+	expr->conf.line = 0;
+}
+
+/* Releases and resets a log-format expression */
+void lf_expr_deinit(struct lf_expr *expr)
+{
+	if ((expr->flags & LF_FL_COMPILED))
+		free_logformat_list(&expr->nodes.list);
+	else
+		logformat_str_free(&expr->str);
+	free(expr->conf.file);
+	/* remove from parent list (if any) */
+	LIST_DEL_INIT(&expr->list);
+
+	lf_expr_init(expr);
+}
+
+/* Transfer a compiled log-format expression from <src> to <dst>
+ * at the end of the operation, <src> is reset
+ */
+void lf_expr_xfer(struct lf_expr *src, struct lf_expr *dst)
+{
+	struct logformat_node *lf, *lfb;
+
+	/* first, reset any existing expr */
+	lf_expr_deinit(dst);
+
+	BUG_ON(!(src->flags & LF_FL_COMPILED));
+
+	/* then proceed with transfer between <src> and <dst> */
+	dst->conf.file = src->conf.file;
+	dst->conf.line = src->conf.line;
+
+	dst->flags |= LF_FL_COMPILED;
+	LIST_INIT(&dst->nodes.list);
+
+	list_for_each_entry_safe(lf, lfb, &src->nodes.list, list) {
+		LIST_DELETE(&lf->list);
+		LIST_APPEND(&dst->nodes.list, &lf->list);
+	}
+
+	/* replace <src> with <dst> in <src>'s list by first adding
+	 * <dst> after <src>, then removing <src>...
+	 */
+	LIST_INSERT(&src->list, &dst->list);
+	LIST_DEL_INIT(&src->list);
+
+	/* src is now empty, perform an explicit reset */
+	lf_expr_init(src);
+}
+
+/* tries to duplicate an uncompiled logformat expression from <orig> to <dest>
+ *
+ * Returns 1 on success and 0 on failure.
+ */
+int lf_expr_dup(const struct lf_expr *orig, struct lf_expr *dest)
+{
+	BUG_ON((orig->flags & LF_FL_COMPILED));
+	lf_expr_deinit(dest);
+	if (orig->str) {
+		dest->str = logformat_str_dup(orig->str);
+		if (!dest->str)
+			goto error;
+	}
+	if (orig->conf.file) {
+		dest->conf.file = strdup(orig->conf.file);
+		if (!dest->conf.file)
+			goto error;
+	}
+	dest->conf.line = orig->conf.line;
+
+	return 1;
+
+ error:
+	lf_expr_deinit(dest);
+	return 0;
+}
+
+/* Builds a log line in <dst> based on <lf_expr>, and stops before reaching
  * <maxsize> characters. Returns the size of the output string in characters,
  * not counting the trailing zero which is always added if the resulting size
  * is not zero. It requires a valid session and optionally a stream. If the
  * stream is NULL, default values will be assumed for the stream part.
  */
-int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t maxsize, struct list *list_format)
+int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t maxsize, struct lf_expr *lf_expr)
 {
+	struct lf_buildctx *ctx = &lf_buildctx;
 	struct proxy *fe = sess->fe;
 	struct proxy *be;
 	struct http_txn *txn;
 	const struct strm_logs *logs;
 	struct connection *fe_conn, *be_conn;
+	struct list *list_format = &lf_expr->nodes.list;
 	unsigned int s_flags;
 	unsigned int uniq_id;
 	struct buffer chunk;
@@ -2617,6 +3590,8 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 	struct strm_logs tmp_strm_log;
 	struct ist path;
 	struct http_uri_parser parser;
+	int g_options = lf_expr->nodes.options; /* global */
+	int first_node = 1;
 
 	/* FIXME: let's limit ourselves to frontend logging for now. */
 
@@ -2698,73 +3673,203 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 
 	tmplog = dst;
 
+	/* reset static ctx struct */
+	ctx->in_text = 0;
+
+	/* start with global ctx by default */
+	lf_buildctx_prepare(ctx, g_options, NULL);
+
 	/* fill logbuffer */
-	if (LIST_ISEMPTY(list_format))
+	if (!(ctx->options & LOG_OPT_ENCODE) && lf_expr_isempty(lf_expr))
 		return 0;
 
+	if (ctx->options & LOG_OPT_ENCODE_JSON)
+		LOGCHAR('{');
+	else if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		/* start indefinite-length map */
+		LOG_CBOR_BYTE(0xBF);
+	}
+
 	list_for_each_entry(tmp, list_format, list) {
 #ifdef USE_OPENSSL
 		struct connection *conn;
 #endif
 		const struct sockaddr_storage *addr;
 		const char *src = NULL;
+		const char *value_beg = NULL;
 		struct sample *key;
-		const struct buffer empty = { };
 
-		switch (tmp->type) {
-			case LOG_FMT_SEPARATOR:
-				if (!last_isspace) {
+		/* first start with basic types (use continue statement to skip
+		 * the current node)
+		 */
+		if (tmp->type == LOG_FMT_SEPARATOR) {
+			if (g_options & LOG_OPT_ENCODE) {
+				/* ignored when global encoding is set */
+				continue;
+			}
+			if (!last_isspace) {
+				LOGCHAR(' ');
+				last_isspace = 1;
+			}
+			continue;
+		}
+		else if (tmp->type == LOG_FMT_TEXT) {
+			/* text */
+			if (g_options & LOG_OPT_ENCODE) {
+				/* ignored when global encoding is set */
+				continue;
+			}
+			src = tmp->arg;
+			iret = strlcpy2(tmplog, src, dst + maxsize - tmplog);
+			if (iret == 0)
+				goto out;
+			tmplog += iret;
+			last_isspace = 0; /* data was written */
+			continue;
+		}
+
+		/* dynamic types handling (use "goto next_fmt" statement to skip
+		 * the current node)
+		 */
+
+		if (g_options & LOG_OPT_ENCODE) {
+			/* only consider global ctx for key encoding */
+			lf_buildctx_prepare(ctx, g_options, NULL);
+
+			if (!tmp->name)
+				goto next_fmt; /* cannot represent anonymous field, ignore */
+
+			if (!first_node) {
+				if (ctx->options & LOG_OPT_ENCODE_JSON) {
+					LOGCHAR(',');
 					LOGCHAR(' ');
-					last_isspace = 1;
 				}
-				break;
+			}
 
-			case LOG_FMT_TEXT: // text
-				src = tmp->arg;
-				iret = strlcpy2(tmplog, src, dst + maxsize - tmplog);
+			if (ctx->options & LOG_OPT_ENCODE_JSON) {
+				LOGCHAR('"');
+				iret = strlcpy2(tmplog, tmp->name, dst + maxsize - tmplog);
 				if (iret == 0)
 					goto out;
 				tmplog += iret;
-				last_isspace = 0;
-				break;
+				LOGCHAR('"');
+				LOGCHAR(':');
+				LOGCHAR(' ');
+			}
+			else if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+				ret = cbor_encode_text(&ctx->encode.cbor, tmplog,
+				                       dst + maxsize, tmp->name,
+				                       strlen(tmp->name));
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
+			}
 
-			case LOG_FMT_EXPR: // sample expression, may be request or response
-				key = NULL;
-				if (tmp->options & LOG_OPT_REQ_CAP)
-					key = sample_fetch_as_type(be, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, tmp->expr, SMP_T_STR);
+			first_node = 0;
+		}
+		value_beg = tmplog;
+
+		/* get the chance to consider per-node options (if not already
+		 * set globally) for printing the value
+		 */
+		lf_buildctx_prepare(ctx, g_options, tmp);
 
-				if (!key && (tmp->options & LOG_OPT_RES_CAP))
-					key = sample_fetch_as_type(be, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL, tmp->expr, SMP_T_STR);
+		if (tmp->type == LOG_FMT_EXPR) {
+			/* sample expression, may be request or response */
+			int type;
 
-				if (!key && !(tmp->options & (LOG_OPT_REQ_CAP|LOG_OPT_RES_CAP))) // cfg, cli
-					key = sample_fetch_as_type(be, sess, s, SMP_OPT_FINAL, tmp->expr, SMP_T_STR);
+			key = NULL;
+			if (ctx->options & LOG_OPT_REQ_CAP)
+				key = sample_process(be, sess, s, SMP_OPT_DIR_REQ|SMP_OPT_FINAL, tmp->expr, NULL);
 
-				if (tmp->options & LOG_OPT_HTTP)
+			if (!key && (ctx->options & LOG_OPT_RES_CAP))
+				key = sample_process(be, sess, s, SMP_OPT_DIR_RES|SMP_OPT_FINAL, tmp->expr, NULL);
+
+			if (!key && !(ctx->options & (LOG_OPT_REQ_CAP|LOG_OPT_RES_CAP))) // cfg, cli
+				key = sample_process(be, sess, s, SMP_OPT_FINAL, tmp->expr, NULL);
+
+			type = SMP_T_STR; // default
+
+			if (key && key->data.type == SMP_T_BIN &&
+			    (ctx->options & LOG_OPT_BIN)) {
+				/* output type is binary, and binary option is set:
+				 * preserve output type unless typecast is set to
+				 * force output type to string
+				 */
+				if (ctx->typecast != SMP_T_STR)
+					type = SMP_T_BIN;
+			}
+
+			/* if encoding is set, try to preserve output type
+			 * with respect to typecast settings
+			 * (ie: str, sint, bool)
+			 *
+			 * Special case for cbor encoding: we also try to
+			 * preserve bin output type since cbor encoders
+			 * know how to deal with binary data.
+			 */
+			if (ctx->options & LOG_OPT_ENCODE) {
+				if (ctx->typecast == SMP_T_STR ||
+				    ctx->typecast == SMP_T_SINT ||
+				    ctx->typecast == SMP_T_BOOL) {
+					/* enforce type */
+					type = ctx->typecast;
+				}
+				else if (key &&
+				         (key->data.type == SMP_T_SINT ||
+				          key->data.type == SMP_T_BOOL ||
+				          ((ctx->options & LOG_OPT_ENCODE_CBOR) &&
+				           key->data.type == SMP_T_BIN))) {
+					/* preserve type */
+					type = key->data.type;
+				}
+			}
+
+			if (key && !sample_convert(key, type))
+				key = NULL;
+			if (ctx->options & LOG_OPT_HTTP)
+				ret = lf_encode_chunk(tmplog, dst + maxsize,
+				                      '%', http_encode_map, key ? &key->data.u.str : &empty, ctx);
+			else {
+				if (key && type == SMP_T_BIN)
 					ret = lf_encode_chunk(tmplog, dst + maxsize,
-					                      '%', http_encode_map, key ? &key->data.u.str : &empty, tmp);
+					                      0, no_escape_map,
+					                      &key->data.u.str,
+					                      ctx);
+				else if (key && type == SMP_T_SINT)
+					ret = lf_int_encode(tmplog, dst + maxsize - tmplog,
+					                    key->data.u.sint, ctx);
+				else if (key && type == SMP_T_BOOL)
+					ret = lf_bool_encode(tmplog, dst + maxsize - tmplog,
+					                     key->data.u.sint, ctx);
 				else
 					ret = lf_text_len(tmplog,
-							  key ? key->data.u.str.area : NULL,
-							  key ? key->data.u.str.data : 0,
-							  dst + maxsize - tmplog,
-							  tmp);
-				if (ret == 0)
-					goto out;
-				tmplog = ret;
-				last_isspace = 0;
-				break;
+					                  key ? key->data.u.str.area : NULL,
+					                  key ? key->data.u.str.data : 0,
+					                  dst + maxsize - tmplog,
+					                  ctx);
+			}
+			if (ret == NULL)
+				goto out;
+			tmplog = ret;
+			last_isspace = 0; /* consider that data was written */
+			goto next_fmt;
+		}
+
+		BUG_ON(tmp->type != LOG_FMT_ALIAS);
 
+		/* logformat alias */
+		switch (tmp->alias->type) {
 			case LOG_FMT_CLIENTIP:  // %ci
 				addr = (s ? sc_src(s->scf) : sess_src(sess));
 				if (addr)
-					ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
+					ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_CLIENTPORT:  // %cp
@@ -2772,30 +3877,29 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 				if (addr) {
 					/* sess->listener is always defined when the session's owner is an inbound connections */
 					if (addr->ss_family == AF_UNIX)
-						ret = ltoa_o(sess->listener->luid, tmplog, dst + maxsize - tmplog);
+						ret = lf_int(tmplog, dst + maxsize - tmplog,
+						             sess->listener->luid, ctx, LF_INT_LTOA);
 					else
-						ret = lf_port(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
+						ret = lf_port(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, ctx);
 				}
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_FRONTENDIP: // %fi
 				addr = (s ? sc_dst(s->scf) : sess_dst(sess));
 				if (addr)
-					ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
+					ret = lf_ip(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case  LOG_FMT_FRONTENDPORT: // %fp
@@ -2803,184 +3907,233 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 				if (addr) {
 					/* sess->listener is always defined when the session's owner is an inbound connections */
 					if (addr->ss_family == AF_UNIX)
-						ret = ltoa_o(sess->listener->luid, tmplog, dst + maxsize - tmplog);
+						ret = lf_int(tmplog, dst + maxsize - tmplog,
+						             sess->listener->luid, ctx, LF_INT_LTOA);
 					else
-						ret = lf_port(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, tmp);
+						ret = lf_port(tmplog, (struct sockaddr *)addr, dst + maxsize - tmplog, ctx);
 				}
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BACKENDIP:  // %bi
 				if (be_conn && conn_get_src(be_conn))
-					ret = lf_ip(tmplog, (const struct sockaddr *)be_conn->src, dst + maxsize - tmplog, tmp);
+					ret = lf_ip(tmplog, (const struct sockaddr *)be_conn->src, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BACKENDPORT:  // %bp
 				if (be_conn && conn_get_src(be_conn))
-					ret = lf_port(tmplog, (struct sockaddr *)be_conn->src, dst + maxsize - tmplog, tmp);
+					ret = lf_port(tmplog, (struct sockaddr *)be_conn->src, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_SERVERIP: // %si
 				if (be_conn && conn_get_dst(be_conn))
-					ret = lf_ip(tmplog, (struct sockaddr *)be_conn->dst, dst + maxsize - tmplog, tmp);
+					ret = lf_ip(tmplog, (struct sockaddr *)be_conn->dst, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_SERVERPORT: // %sp
 				if (be_conn && conn_get_dst(be_conn))
-					ret = lf_port(tmplog, (struct sockaddr *)be_conn->dst, dst + maxsize - tmplog, tmp);
+					ret = lf_port(tmplog, (struct sockaddr *)be_conn->dst, dst + maxsize - tmplog, ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, tmp);
+					ret = lf_text_len(tmplog, NULL, 0, dst + maxsize - tmplog, ctx);
 
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_DATE: // %t = accept date
+			{
+				// "26/Apr/2024:09:39:58.774"
+
 				get_localtime(logs->accept_date.tv_sec, &tm);
-				ret = date2str_log(tmplog, &tm, &logs->accept_date, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!date2str_log(ctx->_buf, &tm, &logs->accept_date, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = date2str_log(tmplog, &tm, &logs->accept_date, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_tr: // %tr = start of request date
+			{
+				// "26/Apr/2024:09:39:58.774"
+
 				/* Note that the timers are valid if we get here */
 				tv_ms_add(&tv, &logs->accept_date, logs->t_idle >= 0 ? logs->t_idle + logs->t_handshake : 0);
 				get_localtime(tv.tv_sec, &tm);
-				ret = date2str_log(tmplog, &tm, &tv, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!date2str_log(ctx->_buf, &tm, &tv, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = date2str_log(tmplog, &tm, &tv, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_DATEGMT: // %T = accept date, GMT
+			{
+				// "26/Apr/2024:07:41:11 +0000"
+
 				get_gmtime(logs->accept_date.tv_sec, &tm);
-				ret = gmt2str_log(tmplog, &tm, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!gmt2str_log(ctx->_buf, &tm, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = gmt2str_log(tmplog, &tm, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_trg: // %trg = start of request date, GMT
+			{
+				// "26/Apr/2024:07:41:11 +0000"
+
 				tv_ms_add(&tv, &logs->accept_date, logs->t_idle >= 0 ? logs->t_idle + logs->t_handshake : 0);
 				get_gmtime(tv.tv_sec, &tm);
-				ret = gmt2str_log(tmplog, &tm, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!gmt2str_log(ctx->_buf, &tm, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = gmt2str_log(tmplog, &tm, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_DATELOCAL: // %Tl = accept date, local
+			{
+				// "26/Apr/2024:09:42:32 +0200"
+
 				get_localtime(logs->accept_date.tv_sec, &tm);
-				ret = localdate2str_log(tmplog, logs->accept_date.tv_sec, &tm, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!localdate2str_log(ctx->_buf, logs->accept_date.tv_sec,
+					                       &tm, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = localdate2str_log(tmplog, logs->accept_date.tv_sec,
+					                        &tm, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_trl: // %trl = start of request date, local
+			{
+				// "26/Apr/2024:09:42:32 +0200"
+
 				tv_ms_add(&tv, &logs->accept_date, logs->t_idle >= 0 ? logs->t_idle + logs->t_handshake : 0);
 				get_localtime(tv.tv_sec, &tm);
-				ret = localdate2str_log(tmplog, tv.tv_sec, &tm, dst + maxsize - tmplog);
+				if (ctx->options & LOG_OPT_ENCODE) {
+					if (!localdate2str_log(ctx->_buf, tv.tv_sec, &tm, sizeof(ctx->_buf)))
+						goto out;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				}
+				else // speedup
+					ret = localdate2str_log(tmplog, tv.tv_sec, &tm, dst + maxsize - tmplog);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_TS: // %Ts
-				if (tmp->options & LOG_OPT_HEXA) {
-					iret = snprintf(tmplog, dst + maxsize - tmplog, "%04X", (unsigned int)logs->accept_date.tv_sec);
-					if (iret < 0 || iret > dst + maxsize - tmplog)
+			{
+				unsigned long value = logs->accept_date.tv_sec;
+
+				if (ctx->options & LOG_OPT_HEXA) {
+					iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%04X", (unsigned int)value);
+					if (iret < 0 || iret >= dst + maxsize - tmplog)
 						goto out;
-					last_isspace = 0;
-					tmplog += iret;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
 				} else {
-					ret = ltoa_o(logs->accept_date.tv_sec, tmplog, dst + maxsize - tmplog);
-					if (ret == NULL)
-						goto out;
-					tmplog = ret;
-					last_isspace = 0;
+					ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				}
-			break;
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
+				break;
+			}
 
 			case LOG_FMT_MS: // %ms
-			if (tmp->options & LOG_OPT_HEXA) {
-					iret = snprintf(tmplog, dst + maxsize - tmplog, "%02X",(unsigned int)logs->accept_date.tv_usec/1000);
-					if (iret < 0 || iret > dst + maxsize - tmplog)
+			{
+				unsigned int value = (unsigned int)logs->accept_date.tv_usec/1000;
+
+				if (ctx->options & LOG_OPT_HEXA) {
+					iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%02X", value);
+					if (iret < 0 || iret >= dst + maxsize - tmplog)
 						goto out;
-					last_isspace = 0;
-					tmplog += iret;
-			} else {
-				if ((dst + maxsize - tmplog) < 4)
-					goto out;
-				ret = utoa_pad((unsigned int)logs->accept_date.tv_usec/1000,
-				               tmplog, 4);
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
+				} else {
+					ret = lf_int(tmplog, dst + maxsize - tmplog, value,
+					             ctx, LF_INT_UTOA_PAD_4);
+				}
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
+				break;
 			}
-			break;
 
 			case LOG_FMT_FRONTEND: // %f
 				src = fe->id;
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_FRONTEND_XPRT: // %ft
 				src = fe->id;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
-				iret = strlcpy2(tmplog, src, dst + maxsize - tmplog);
-				if (iret == 0)
+				LOG_VARTEXT_START();
+				ret = lf_rawtext(tmplog, src, dst + maxsize - tmplog, ctx);
+				if (ret == NULL)
 					goto out;
-				tmplog += iret;
+				tmplog = ret;
 
 				/* sess->listener may be undefined if the session's owner is a health-check */
 				if (sess->listener && sess->listener->bind_conf->xprt->get_ssl_sock_ctx)
 					LOGCHAR('~');
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
-				last_isspace = 0;
 				break;
 #ifdef USE_OPENSSL
 			case LOG_FMT_SSL_CIPHER: // %sslc
@@ -2989,11 +4142,10 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 				if (conn) {
 					src = ssl_sock_get_cipher_name(conn);
 				}
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_SSL_VERSION: // %sslv
@@ -3002,20 +4154,18 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 				if (conn) {
 					src = ssl_sock_get_proto_version(conn);
 				}
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 #endif
 			case LOG_FMT_BACKEND: // %b
 				src = be->id;
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_SERVER: // %s
@@ -3035,293 +4185,310 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					src = "<NOSRV>";
 					break;
 				}
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_Th: // %Th = handshake time
-				ret = ltoa_o(logs->t_handshake, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->t_handshake, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_Ti: // %Ti = HTTP idle time
-				ret = ltoa_o(logs->t_idle, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->t_idle, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_TR: // %TR = HTTP request time
-				ret = ltoa_o((t_request >= 0) ? t_request - logs->t_idle - logs->t_handshake : -1,
-				             tmplog, dst + maxsize - tmplog);
+			{
+				long value = (t_request >= 0) ? t_request - logs->t_idle - logs->t_handshake : -1;
+
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_TQ: // %Tq = Th + Ti + TR
-				ret = ltoa_o(t_request, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, t_request, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_TW: // %Tw
-				ret = ltoa_o((logs->t_queue >= 0) ? logs->t_queue - t_request : -1,
-						tmplog, dst + maxsize - tmplog);
+			{
+				long value = (logs->t_queue >= 0) ? logs->t_queue - t_request : -1;
+
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_TC: // %Tc
-				ret = ltoa_o((logs->t_connect >= 0) ? logs->t_connect - logs->t_queue : -1,
-						tmplog, dst + maxsize - tmplog);
+			{
+				long value = (logs->t_connect >= 0) ? logs->t_connect - logs->t_queue : -1;
+
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_Tr: // %Tr
-				ret = ltoa_o((logs->t_data >= 0) ? logs->t_data - logs->t_connect : -1,
-						tmplog, dst + maxsize - tmplog);
+			{
+				long value = (logs->t_data >= 0) ? logs->t_data - logs->t_connect : -1;
+
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_TD: // %Td
+			{
+				long value;
+
 				if (be->mode == PR_MODE_HTTP)
-					ret = ltoa_o((logs->t_data >= 0) ? logs->t_close - logs->t_data : -1,
-					             tmplog, dst + maxsize - tmplog);
+					value = (logs->t_data >= 0) ? logs->t_close - logs->t_data : -1;
 				else
-					ret = ltoa_o((logs->t_connect >= 0) ? logs->t_close - logs->t_connect : -1,
-					             tmplog, dst + maxsize - tmplog);
+					value = (logs->t_connect >= 0) ? logs->t_close - logs->t_connect : -1;
+
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
+
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_Ta:  // %Ta = active time = Tt - Th - Ti
+			{
+				long value = logs->t_close - (logs->t_idle >= 0 ? logs->t_idle + logs->t_handshake : 0);
+
 				if (!(fe->to_log & LW_BYTES))
-					LOGCHAR('+');
-				ret = ltoa_o(logs->t_close - (logs->t_idle >= 0 ? logs->t_idle + logs->t_handshake : 0),
-					     tmplog, dst + maxsize - tmplog);
+					LOGMETACHAR('+');
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_TT:  // %Tt = total time
 				if (!(fe->to_log & LW_BYTES))
-					LOGCHAR('+');
-				ret = ltoa_o(logs->t_close, tmplog, dst + maxsize - tmplog);
+					LOGMETACHAR('+');
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->t_close, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_TU:  // %Tu = total time seen by user = Tt - Ti
+			{
+				long value = logs->t_close - (logs->t_idle >= 0 ? logs->t_idle : 0);
+
 				if (!(fe->to_log & LW_BYTES))
-					LOGCHAR('+');
-				ret = ltoa_o(logs->t_close - (logs->t_idle >= 0 ? logs->t_idle : 0),
-					     tmplog, dst + maxsize - tmplog);
+					LOGMETACHAR('+');
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_STATUS: // %ST
-				ret = ltoa_o(status, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, status, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BYTES: // %B
 				if (!(fe->to_log & LW_BYTES))
-					LOGCHAR('+');
-				ret = lltoa(logs->bytes_out, tmplog, dst + maxsize - tmplog);
+					LOGMETACHAR('+');
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->bytes_out, ctx, LF_INT_LLTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BYTES_UP: // %U
-				ret = lltoa(logs->bytes_in, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->bytes_in, ctx, LF_INT_LLTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_CCLIENT: // %CC
 				src = txn ? txn->cli_cookie : NULL;
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_CSERVER: // %CS
 				src = txn ? txn->srv_cookie : NULL;
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_TERMSTATE: // %ts
-				LOGCHAR(sess_term_cond[(s_flags & SF_ERR_MASK) >> SF_ERR_SHIFT]);
-				LOGCHAR(sess_fin_state[(s_flags & SF_FINST_MASK) >> SF_FINST_SHIFT]);
-				*tmplog = '\0';
-				last_isspace = 0;
+			{
+				ctx->_buf[0] = sess_term_cond[(s_flags & SF_ERR_MASK) >> SF_ERR_SHIFT];
+				ctx->_buf[1] = sess_fin_state[(s_flags & SF_FINST_MASK) >> SF_FINST_SHIFT];
+				ret = lf_rawtext_len(tmplog, ctx->_buf, 2, maxsize - (tmplog - dst), ctx);
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
 				break;
+			}
 
 			case LOG_FMT_TERMSTATE_CK: // %tsc, same as TS with cookie state (for mode HTTP)
-				LOGCHAR(sess_term_cond[(s_flags & SF_ERR_MASK) >> SF_ERR_SHIFT]);
-				LOGCHAR(sess_fin_state[(s_flags & SF_FINST_MASK) >> SF_FINST_SHIFT]);
-				LOGCHAR((txn && (be->ck_opts & PR_CK_ANY)) ? sess_cookie[(txn->flags & TX_CK_MASK) >> TX_CK_SHIFT] : '-');
-				LOGCHAR((txn && (be->ck_opts & PR_CK_ANY)) ? sess_set_cookie[(txn->flags & TX_SCK_MASK) >> TX_SCK_SHIFT] : '-');
-				last_isspace = 0;
+			{
+				ctx->_buf[0] = sess_term_cond[(s_flags & SF_ERR_MASK) >> SF_ERR_SHIFT];
+				ctx->_buf[1] = sess_fin_state[(s_flags & SF_FINST_MASK) >> SF_FINST_SHIFT];
+				ctx->_buf[2] = (txn && (be->ck_opts & PR_CK_ANY)) ? sess_cookie[(txn->flags & TX_CK_MASK) >> TX_CK_SHIFT] : '-';
+				ctx->_buf[3] = (txn && (be->ck_opts & PR_CK_ANY)) ? sess_set_cookie[(txn->flags & TX_SCK_MASK) >> TX_SCK_SHIFT] : '-';
+				ret = lf_rawtext_len(tmplog, ctx->_buf, 4, maxsize - (tmplog - dst), ctx);
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
 				break;
+			}
 
 			case LOG_FMT_ACTCONN: // %ac
-				ret = ltoa_o(actconn, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, actconn, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_FECONN:  // %fc
-				ret = ltoa_o(fe->feconn, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, fe->feconn, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BECONN:  // %bc
-				ret = ltoa_o(be->beconn, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, be->beconn, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_SRVCONN:  // %sc
+			{
+				unsigned long value;
+
 				switch (obj_type(s ? s->target : sess->origin)) {
 				case OBJ_TYPE_SERVER:
-					ret = ultoa_o(__objt_server(s->target)->cur_sess,
-						      tmplog, dst + maxsize - tmplog);
+					value = __objt_server(s->target)->cur_sess;
 					break;
 				case OBJ_TYPE_CHECK:
-					ret = ultoa_o(__objt_check(sess->origin)->server
-						      ? __objt_check(sess->origin)->server->cur_sess
-						      : 0, tmplog, dst + maxsize - tmplog);
+					value = (__objt_check(sess->origin)->server
+					         ? __objt_check(sess->origin)->server->cur_sess
+					         : 0);
 					break;
 				default:
-					ret = ultoa_o(0, tmplog, dst + maxsize - tmplog);
+					value = 0;
 					break;
 				}
 
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_ULTOA);
+
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_RETRIES:  // %rc
+			{
+				long int value = (s ? s->conn_retries : 0);
+
 				if (s_flags & SF_REDISP)
-					LOGCHAR('+');
-				ret = ltoa_o((s  ? s->conn_retries : 0), tmplog, dst + maxsize - tmplog);
+					LOGMETACHAR('+');
+				ret = lf_int(tmplog, dst + maxsize - tmplog, value, ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
+			}
 
 			case LOG_FMT_SRVQUEUE: // %sq
-				ret = ltoa_o(logs->srv_queue_pos, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->srv_queue_pos,
+				             ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_BCKQUEUE:  // %bq
-				ret = ltoa_o(logs->prx_queue_pos, tmplog, dst + maxsize - tmplog);
+				ret = lf_int(tmplog, dst + maxsize - tmplog, logs->prx_queue_pos,
+				             ctx, LF_INT_LTOA);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HDRREQUEST: // %hr
 				/* request header */
 				if (fe->nb_req_cap && s && s->req_cap) {
-					if (tmp->options & LOG_OPT_QUOTE)
-						LOGCHAR('"');
+					LOG_VARTEXT_START();
 					LOGCHAR('{');
 					for (hdr = 0; hdr < fe->nb_req_cap; hdr++) {
 						if (hdr)
 							LOGCHAR('|');
 						if (s->req_cap[hdr] != NULL) {
 							ret = lf_encode_string(tmplog, dst + maxsize,
-							                       '#', hdr_encode_map, s->req_cap[hdr], tmp);
-							if (ret == NULL || *ret != '\0')
+							                       '#', hdr_encode_map, s->req_cap[hdr], ctx);
+							if (ret == NULL)
 								goto out;
 							tmplog = ret;
 						}
 					}
 					LOGCHAR('}');
-					if (tmp->options & LOG_OPT_QUOTE)
-						LOGCHAR('"');
-					last_isspace = 0;
 				}
 				break;
 
 			case LOG_FMT_HDRREQUESTLIST: // %hrl
 				/* request header list */
 				if (fe->nb_req_cap && s && s->req_cap) {
+					LOG_STRARRAY_START();
 					for (hdr = 0; hdr < fe->nb_req_cap; hdr++) {
 						if (hdr > 0)
-							LOGCHAR(' ');
-						if (tmp->options & LOG_OPT_QUOTE)
-							LOGCHAR('"');
+							LOG_STRARRAY_NEXT();
+						LOG_VARTEXT_START();
 						if (s->req_cap[hdr] != NULL) {
 							ret = lf_encode_string(tmplog, dst + maxsize,
-							                       '#', hdr_encode_map, s->req_cap[hdr], tmp);
-							if (ret == NULL || *ret != '\0')
+							                       '#', hdr_encode_map, s->req_cap[hdr], ctx);
+							if (ret == NULL)
 								goto out;
 							tmplog = ret;
-						} else if (!(tmp->options & LOG_OPT_QUOTE))
+						} else if (!(ctx->options & LOG_OPT_QUOTE))
 							LOGCHAR('-');
-						if (tmp->options & LOG_OPT_QUOTE)
-							LOGCHAR('"');
-						last_isspace = 0;
+						/* Manually end variable text as we're emitting multiple
+						 * texts at once
+						 */
+						LOG_VARTEXT_END();
 					}
+					LOG_STRARRAY_END();
 				}
 				break;
 
@@ -3329,70 +4496,63 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 			case LOG_FMT_HDRRESPONS: // %hs
 				/* response header */
 				if (fe->nb_rsp_cap && s && s->res_cap) {
-					if (tmp->options & LOG_OPT_QUOTE)
-						LOGCHAR('"');
+					LOG_VARTEXT_START();
 					LOGCHAR('{');
 					for (hdr = 0; hdr < fe->nb_rsp_cap; hdr++) {
 						if (hdr)
 							LOGCHAR('|');
 						if (s->res_cap[hdr] != NULL) {
 							ret = lf_encode_string(tmplog, dst + maxsize,
-							                       '#', hdr_encode_map, s->res_cap[hdr], tmp);
-							if (ret == NULL || *ret != '\0')
+							                       '#', hdr_encode_map, s->res_cap[hdr], ctx);
+							if (ret == NULL)
 								goto out;
 							tmplog = ret;
 						}
 					}
 					LOGCHAR('}');
-					last_isspace = 0;
-					if (tmp->options & LOG_OPT_QUOTE)
-						LOGCHAR('"');
 				}
 				break;
 
 			case LOG_FMT_HDRRESPONSLIST: // %hsl
 				/* response header list */
 				if (fe->nb_rsp_cap && s && s->res_cap) {
+					LOG_STRARRAY_START();
 					for (hdr = 0; hdr < fe->nb_rsp_cap; hdr++) {
 						if (hdr > 0)
-							LOGCHAR(' ');
-						if (tmp->options & LOG_OPT_QUOTE)
-							LOGCHAR('"');
+							LOG_STRARRAY_NEXT();
+						LOG_VARTEXT_START();
 						if (s->res_cap[hdr] != NULL) {
 							ret = lf_encode_string(tmplog, dst + maxsize,
-							                       '#', hdr_encode_map, s->res_cap[hdr], tmp);
-							if (ret == NULL || *ret != '\0')
+							                       '#', hdr_encode_map, s->res_cap[hdr], ctx);
+							if (ret == NULL)
 								goto out;
 							tmplog = ret;
-						} else if (!(tmp->options & LOG_OPT_QUOTE))
+						} else if (!(ctx->options & LOG_OPT_QUOTE))
 							LOGCHAR('-');
-						if (tmp->options & LOG_OPT_QUOTE)
-							LOGCHAR('"');
-						last_isspace = 0;
+						/* Manually end variable text as we're emitting multiple
+						 * texts at once
+						 */
+						LOG_VARTEXT_END();
 					}
+					LOG_STRARRAY_END();
 				}
 				break;
 
 			case LOG_FMT_REQ: // %r
 				/* Request */
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
 				ret = lf_encode_string(tmplog, dst + maxsize,
-				                       '#', url_encode_map, uri, tmp);
-				if (ret == NULL || *ret != '\0')
+				                       '#', url_encode_map, uri, ctx);
+				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_PATH: // %HP
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
 
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				end = uri + strlen(uri);
 				// look for the first whitespace character
@@ -3417,22 +4577,18 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = spc - uri;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_PATH_ONLY: // %HPO
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
 
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				end = uri + strlen(uri);
 
@@ -3463,20 +4619,16 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = path.len;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_QUERY: // %HQ
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				if (!txn || !txn->uri) {
 					chunk.area = "<BADREQ>";
@@ -3497,22 +4649,18 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = uri - qmark;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_URI: // %HU
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
 
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				end = uri + strlen(uri);
 				// look for the first whitespace character
@@ -3537,21 +4685,17 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = spc - uri;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_METHOD: // %HM
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				end = uri + strlen(uri);
 				// look for the first whitespace character
@@ -3567,21 +4711,17 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = spc - uri;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_HTTP_VERSION: // %HV
 				uri = txn && txn->uri ? txn->uri : "<BADREQ>";
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
+				LOG_VARTEXT_START();
 
 				end = uri + strlen(uri);
 				// look for the first whitespace character
@@ -3612,87 +4752,121 @@ int sess_build_logline(struct session *sess, struct stream *s, char *dst, size_t
 					chunk.data = end - uri;
 				}
 
-				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, tmp);
-				if (ret == NULL || *ret != '\0')
+				ret = lf_encode_chunk(tmplog, dst + maxsize, '#', url_encode_map, &chunk, ctx);
+				if (ret == NULL)
 					goto out;
 
 				tmplog = ret;
-				if (tmp->options & LOG_OPT_QUOTE)
-					LOGCHAR('"');
 
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_COUNTER: // %rt
-				if (tmp->options & LOG_OPT_HEXA) {
-					iret = snprintf(tmplog, dst + maxsize - tmplog, "%04X", uniq_id);
-					if (iret < 0 || iret > dst + maxsize - tmplog)
+				if (ctx->options & LOG_OPT_HEXA) {
+					iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%04X", uniq_id);
+					if (iret < 0 || iret >= dst + maxsize - tmplog)
 						goto out;
-					last_isspace = 0;
-					tmplog += iret;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
 				} else {
-					ret = ltoa_o(uniq_id, tmplog, dst + maxsize - tmplog);
-					if (ret == NULL)
-						goto out;
-					tmplog = ret;
-					last_isspace = 0;
+					ret = lf_int(tmplog, dst + maxsize - tmplog, uniq_id, ctx, LF_INT_LTOA);
 				}
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
 				break;
 
 			case LOG_FMT_LOGCNT: // %lc
-				if (tmp->options & LOG_OPT_HEXA) {
-					iret = snprintf(tmplog, dst + maxsize - tmplog, "%04X", fe->log_count);
-					if (iret < 0 || iret > dst + maxsize - tmplog)
+				if (ctx->options & LOG_OPT_HEXA) {
+					iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%04X", fe->log_count);
+					if (iret < 0 || iret >= dst + maxsize - tmplog)
 						goto out;
-					last_isspace = 0;
-					tmplog += iret;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
 				} else {
-					ret = ultoa_o(fe->log_count, tmplog, dst + maxsize - tmplog);
-					if (ret == NULL)
-						goto out;
-					tmplog = ret;
-					last_isspace = 0;
+					ret = lf_int(tmplog, dst + maxsize - tmplog, fe->log_count,
+					             ctx, LF_INT_ULTOA);
 				}
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
 				break;
 
 			case LOG_FMT_HOSTNAME: // %H
 				src = hostname;
-				ret = lf_text(tmplog, src, dst + maxsize - tmplog, tmp);
+				ret = lf_text(tmplog, src, dst + maxsize - tmplog, ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 			case LOG_FMT_PID: // %pid
-				if (tmp->options & LOG_OPT_HEXA) {
-					iret = snprintf(tmplog, dst + maxsize - tmplog, "%04X", pid);
-					if (iret < 0 || iret > dst + maxsize - tmplog)
+				if (ctx->options & LOG_OPT_HEXA) {
+					iret = snprintf(ctx->_buf, sizeof(ctx->_buf), "%04X", pid);
+					if (iret < 0 || iret >= dst + maxsize - tmplog)
 						goto out;
-					last_isspace = 0;
-					tmplog += iret;
+					ret = lf_rawtext(tmplog, ctx->_buf, dst + maxsize - tmplog, ctx);
 				} else {
-					ret = ltoa_o(pid, tmplog, dst + maxsize - tmplog);
-					if (ret == NULL)
-						goto out;
-					tmplog = ret;
-					last_isspace = 0;
+					ret = lf_int(tmplog, dst + maxsize - tmplog, pid, ctx, LF_INT_LTOA);
 				}
+				if (ret == NULL)
+					goto out;
+				tmplog = ret;
 				break;
 
 			case LOG_FMT_UNIQUEID: // %ID
 				ret = NULL;
 				if (s)
-					ret = lf_text_len(tmplog, s->unique_id.ptr, s->unique_id.len, maxsize - (tmplog - dst), tmp);
+					ret = lf_text_len(tmplog, s->unique_id.ptr, s->unique_id.len, maxsize - (tmplog - dst), ctx);
 				else
-					ret = lf_text_len(tmplog, NULL, 0, maxsize - (tmplog - dst), tmp);
+					ret = lf_text_len(tmplog, NULL, 0, maxsize - (tmplog - dst), ctx);
 				if (ret == NULL)
 					goto out;
 				tmplog = ret;
-				last_isspace = 0;
 				break;
 
 		}
+ next_fmt:
+		if (value_beg == tmplog) {
+			/* handle the case where no data was generated for the value after
+			 * the key was already announced
+			 */
+			if (ctx->options & LOG_OPT_ENCODE_JSON) {
+				/* for JSON, we simply output 'null' */
+				iret = snprintf(tmplog, dst + maxsize - tmplog, "null");
+				if (iret < 0 || iret >= dst + maxsize - tmplog)
+					goto out;
+				tmplog += iret;
+			}
+			if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+				/* for CBOR, we have the '22' primitive which is known as
+				 * NULL
+				 */
+				LOG_CBOR_BYTE(0xF6);
+			}
+
+		}
+
+		/* if variable text was started for the current node data, we need
+		 * to end it
+		 */
+		LOG_VARTEXT_END();
+		if (tmplog != value_beg) {
+			/* data was actually generated for the current dynamic
+			 * node, reset the space hint so that a new space may
+			 * now be emitted when relevant.
+			 */
+			last_isspace = 0;
+		}
+	}
+
+	/* back to global ctx (some encoding types may need to output
+	 * ending closure)
+	*/
+	lf_buildctx_prepare(ctx, g_options, NULL);
+
+	if (ctx->options & LOG_OPT_ENCODE_JSON)
+		LOGCHAR('}');
+	else if (ctx->options & LOG_OPT_ENCODE_CBOR) {
+		/* end indefinite-length map */
+		LOG_CBOR_BYTE(0xFF);
 	}
 
 out:
@@ -3738,11 +4912,11 @@ void strm_log(struct stream *s)
 	}
 
 	/* if unique-id was not generated */
-	if (!isttest(s->unique_id) && !LIST_ISEMPTY(&sess->fe->format_unique_id)) {
+	if (!isttest(s->unique_id) && !lf_expr_isempty(&sess->fe->format_unique_id)) {
 		stream_generate_unique_id(s, &sess->fe->format_unique_id);
 	}
 
-	if (!LIST_ISEMPTY(&sess->fe->logformat_sd)) {
+	if (!lf_expr_isempty(&sess->fe->logformat_sd)) {
 		sd_size = build_logline(s, logline_rfc5424, global.max_syslog_len,
 		                        &sess->fe->logformat_sd);
 	}
@@ -3780,13 +4954,13 @@ void sess_log(struct session *sess)
 	if (sess->fe->options2 & PR_O2_LOGERRORS)
 		level = LOG_ERR;
 
-	if (!LIST_ISEMPTY(&sess->fe->logformat_sd)) {
+	if (!lf_expr_isempty(&sess->fe->logformat_sd)) {
 		sd_size = sess_build_logline(sess, NULL,
 		                             logline_rfc5424, global.max_syslog_len,
 		                             &sess->fe->logformat_sd);
 	}
 
-	if (!LIST_ISEMPTY(&sess->fe->logformat_error))
+	if (!lf_expr_isempty(&sess->fe->logformat_error))
 		size = sess_build_logline(sess, NULL, logline, global.max_syslog_len, &sess->fe->logformat_error);
 	else
 		size = sess_build_logline(sess, NULL, logline, global.max_syslog_len, &sess->fe->logformat);
@@ -4212,7 +5386,7 @@ static void syslog_io_handler(struct appctx *appctx)
 	char *message;
 	size_t size;
 
-	if (unlikely(se_fl_test(appctx->sedesc, (SE_FL_EOS|SE_FL_ERROR|SE_FL_SHR|SE_FL_SHW)))) {
+	if (unlikely(se_fl_test(appctx->sedesc, (SE_FL_EOS|SE_FL_ERROR)))) {
 		co_skip(sc_oc(sc), co_data(sc_oc(sc)));
 		goto out;
 	}
@@ -4337,6 +5511,40 @@ static struct applet syslog_applet = {
 	.release = NULL,
 };
 
+/* Atomically append an event to applet >ctx>'s output, prepending it with its
+ * size in decimal followed by a space. The line is read from vectors <v1> and
+ * <v2> at offset <ofs> relative to the area's origin, for <len> bytes. It
+ * returns the number of bytes consumed from the input vectors on success, -1
+ * if it temporarily cannot (buffer full), -2 if it will never be able to (too
+ * large msg). The input vectors are not modified. The caller is responsible for
+ * making sure that there are at least ofs+len bytes in the input buffer.
+ */
+ssize_t syslog_applet_append_event(void *ctx, struct ist v1, struct ist v2, size_t ofs, size_t len)
+{
+	struct appctx *appctx = ctx;
+	char *p;
+
+	/* first, encode the message's size */
+	chunk_reset(&trash);
+	p = ulltoa(len, trash.area, b_size(&trash));
+	if (p) {
+		trash.data = p - trash.area;
+		trash.area[trash.data++] = ' ';
+	}
+
+	/* check if the message has a chance to fit */
+	if (unlikely(!p || trash.data + len > b_size(&trash)))
+		return -2;
+
+	/* try to transfer it or report full */
+	trash.data += vp_peek_ofs(v1, v2, ofs, trash.area + trash.data, len);
+	if (applet_putchk(appctx, &trash) == -1)
+		return -1;
+
+	/* OK done */
+	return len;
+}
+
 /*
  * Parse "log-forward" section and create corresponding sink buffer.
  *
@@ -4397,7 +5605,7 @@ int cfg_parse_log_forward(const char *file, int linenum, char **args, int kwm)
 		px->conf.file = strdup(file);
 		px->conf.line = linenum;
 		px->mode = PR_MODE_SYSLOG;
-		px->last_change = ns_to_sec(now_ns);
+		px->fe_counters.last_change = ns_to_sec(now_ns);
 		px->cap = PR_CAP_FE;
 		px->maxconn = 10;
 		px->timeout.client = TICK_ETERNITY;
@@ -4653,6 +5861,7 @@ static int postresolve_loggers()
 REGISTER_CONFIG_SECTION("log-forward", cfg_parse_log_forward, NULL);
 REGISTER_POST_CHECK(postresolve_loggers);
 REGISTER_POST_PROXY_CHECK(postcheck_log_backend);
+REGISTER_POST_PROXY_CHECK(postcheck_logformat_proxy);
 
 REGISTER_PER_THREAD_ALLOC(init_log_buffers);
 REGISTER_PER_THREAD_FREE(deinit_log_buffers);