BUG/MINOR: mux-fcgi: Be sure to send empty STDING record in case of zero-copy
When the last HTX DATA block was copied in zero-copy, the empty STDIN
record, marking the end of the request data was never sent. Thanks to this
patch, it is now sent.
This patch must be backported as far as 2.4.
diff --git a/src/mux_fcgi.c b/src/mux_fcgi.c
index 0ae5e5e..ab76fbb 100644
--- a/src/mux_fcgi.c
+++ b/src/mux_fcgi.c
@@ -2100,9 +2100,10 @@
size = htx_get_blksz(blk);
if (unlikely(size == count && htx_nbblks(htx) == 1 && type == HTX_BLK_DATA)) {
void *old_area = mbuf->area;
+ int eom = (htx->flags & HTX_FL_EOM);
/* Last block of the message: Reserve the size for the empty stdin record */
- if (htx->flags & HTX_FL_EOM)
+ if (eom)
extra_bytes = FCGI_RECORD_HEADER_SZ;
if (b_data(mbuf)) {
@@ -2138,6 +2139,8 @@
htx = (struct htx *)buf->area;
htx_reset(htx);
+ if (eom)
+ goto empty_stdin;
goto end;
}
@@ -2218,6 +2221,7 @@
/* Send the empty stding here to finish the message */
if (htx_is_empty(htx) && (htx->flags & HTX_FL_EOM)) {
+ empty_stdin:
TRACE_PROTO("sending FCGI STDIN record", FCGI_EV_TX_RECORD|FCGI_EV_TX_STDIN, fconn->conn, fstrm, htx);
if (!fcgi_strm_send_empty_stdin(fconn, fstrm)) {
/* bytes already reserved for this record. It should not fail */