RepoMirrors/haproxy
1
0
Fork 0
mirror of http://git.haproxy.org/git/haproxy.git/ synced 2024-12-18 01:14:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

MINOR: htx: Rename HTX_FL_EOI flag into HTX_FL_EOM

Browse Source 
The HTX_FL_EOI flag is not well named. For now, it is not very used. But
that will change. It will replace the EOM block. Thus, it is renamed.
This commit is contained in:
Christopher Faulet 2020-11-20 17:43:16 +01:00
parent 5be651d4d7
commit 42432f347f
11 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/prometheus-exporter/service-prometheus.c
View File

@ -1226,7 +1226,7 @@ static void promex_appctx_handle_io(struct appctx *appctx)
case PROMEX_ST_DONE:
/* Don't add TLR because mux-h1 will take care of it */
res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
res_htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
si_rx_room_blk(si);
goto out;

2
include/haproxy/htx-t.h
View File

@ -145,7 +145,7 @@
#define HTX_FL_PROCESSING_ERROR 0x00000002 /* Set when a processing error occurred */
/* 0x00000004 unused */
#define HTX_FL_PROXY_RESP 0x00000008 /* Set when the response was generated by HAProxy */
#define HTX_FL_EOI 0x00000010 /* Set when end-of-input is reached from the HTX point of view
#define HTX_FL_EOM 0x00000010 /* Set when end-of-message is reached from the HTTP point of view
* (at worst, on the EOM block is missing)
*/

2
include/haproxy/htx.h
View File

@ -591,7 +591,7 @@ static inline int htx_is_not_empty(const struct htx *htx)
*/
static inline int htx_expect_more(const struct htx *htx)
{
return !(htx->flags & HTX_FL_EOI);
return !(htx->flags & HTX_FL_EOM);
}
/* Copy an HTX message stored in the buffer <msg> to <htx>. We take care to

2
src/cache.c
View File

@ -1499,7 +1499,7 @@ static void http_cache_io_handler(struct appctx *appctx)
}
if (appctx->st0 == HTX_CACHE_EOM) {
res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
res_htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
si_rx_room_blk(si);
goto out;

2
src/h1_htx.c
View File

@ -605,7 +605,7 @@ int h1_parse_msg_eom(struct h1m *h1m, struct htx *dsthtx, size_t max)
return 0;
}
dsthtx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
dsthtx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (max < sizeof(struct htx_blk) + 1 || !htx_add_endof(dsthtx, HTX_BLK_EOM))
return 0;

4
src/h2.c
View File

@ -507,7 +507,7 @@ int h2_make_htx_request(struct http_hdr *list, struct htx *htx, unsigned int *ms
if (*msgf & H2_MSGF_BODY_TUNNEL) {
/* Add the EOM for tunnel requests (CONNECT) */
htx->flags |= HTX_FL_EOI; /* no more message data are expected */
htx->flags |= HTX_FL_EOM; /* no more message data are expected */
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto fail;
}
@ -720,7 +720,7 @@ int h2_make_htx_response(struct http_hdr *list, struct htx *htx, unsigned int *m
if (*msgf & H2_MSGF_BODY_TUNNEL) {
/* Tunnel sucessfully established, add the EOM now, all data are part of the tunnel */
htx->flags |= HTX_FL_EOI; /* no more message data are expected */
htx->flags |= HTX_FL_EOM; /* no more message data are expected */
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto fail;
}

2
src/hlua.c
View File

@ -7468,7 +7468,7 @@ void hlua_applet_http_fct(struct appctx *ctx)
goto error;
/* Don't add TLR because mux-h1 will take care of it */
res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
res_htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
si_rx_room_blk(si);
goto out;

2
src/http_ana.c
View File

@ -4409,7 +4409,7 @@ int http_forward_proxy_resp(struct stream *s, int final)
channel_auto_close(res);
channel_shutr_now(res);
res->flags |= CF_EOI; /* The response is terminated, add EOI */
htxbuf(&res->buf)->flags |= HTX_FL_EOI; /* no more data are expected */
htxbuf(&res->buf)->flags |= HTX_FL_EOM; /* no more data are expected */
}
else {
/* Send ASAP informational messages. Rely on CF_EOI for final

6
src/mux_h2.c
View File

@ -4721,7 +4721,7 @@ next_frame:
if (htx_get_tail_type(htx) != HTX_BLK_EOM && (h2c->dff & H2_F_HEADERS_END_STREAM)) {
/* Mark the end of message using EOM */
htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(htx, HTX_BLK_EOM)) {
TRACE_STATE("failed to append HTX EOM block into rxbuf", H2_EV_RX_FRAME|H2_EV_RX_HDR|H2_EV_H2S_ERR, h2c->conn);
goto fail;
@ -4864,7 +4864,7 @@ try_again:
* EOM was already reported.
*/
if ((h2c->flags & H2_CF_IS_BACK) || !(h2s->flags & H2_SF_TUNNEL_ABRT)) {
htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(htx, HTX_BLK_EOM)) {
TRACE_STATE("h2s rxbuf is full, failed to add EOM", H2_EV_RX_FRAME|H2_EV_RX_DATA|H2_EV_H2S_BLK, h2c->conn, h2s);
h2c->flags |= H2_CF_DEM_SFULL;
@ -6112,7 +6112,7 @@ static size_t h2_rcv_buf(struct conn_stream *cs, struct buffer *buf, size_t coun
cs->flags |= CS_FL_EOI;
}
else if (htx_is_empty(h2s_htx))
buf_htx->flags |= (h2s_htx->flags & HTX_FL_EOI);
buf_htx->flags |= (h2s_htx->flags & HTX_FL_EOM);
buf_htx->extra = (h2s_htx->extra ? (h2s_htx->data + h2s_htx->extra) : 0);
htx_to_buf(buf_htx, buf);

2
src/stats.c
View File

@ -4138,7 +4138,7 @@ static void http_stats_io_handler(struct appctx *appctx)
if (appctx->st0 == STAT_HTTP_DONE) {
/* Don't add TLR because mux-h1 will take care of it */
res_htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
res_htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(res_htx, HTX_BLK_EOM)) {
si_rx_room_blk(si);
goto out;

2
src/tcpcheck.c
View File

@ -1360,7 +1360,7 @@ enum tcpcheck_eval_ret tcpcheck_eval_send(struct check *check, struct tcpcheck_r
(istlen(body) && !htx_add_data_atonce(htx, body)))
goto error_htx;
htx->flags |= HTX_FL_EOI; /* no more data are expected. Only EOM remains to add now */
htx->flags |= HTX_FL_EOM; /* no more data are expected. Only EOM remains to add now */
if (!htx_add_endof(htx, HTX_BLK_EOM))
goto error_htx;