upstream/haproxy
1
0
Fork 0
mirror of https://github.com/haproxy/haproxy.git synced 2026-05-27 03:33:36 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 16

CLEANUP: mux-fcgi/mux-spop: Remove copy/pasted comment about slow realign

Browse source 
A comment about the condition to perform a slow realign of the demux buffer
was abusively copy/pasted from the FCGI multiplexer at different places in
the FCGI and SPOP multiplexers. Let's remove these comments.
This commit is contained in:
Christopher Faulet 2026-05-26 18:20:01 +02:00
parent 010ab9798e
commit 16446de17c
2 changed files with 4 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/mux_fcgi.c
View file

@ -2516,13 +2516,8 @@ static int fcgi_strm_handle_end_request(struct fcgi_conn *fconn, struct fcgi_str
return 0;
}
if (unlikely(b_contig_data(dbuf, 0) < fconn->drl)) {
/* Realign the dmux buffer if the record wraps. It is unexpected
* at this stage because it should be the first record received
* from the FCGI application.
*/
if (unlikely(b_contig_data(dbuf, 0) < fconn->drl))
b_slow_realign_ofs(dbuf, trash.area, 0);
}
inbuf = b_make(b_head(dbuf), b_data(dbuf), 0, fconn->drl);

16
src/mux_spop.c
View file

@ -1655,7 +1655,7 @@ static int spop_conn_handle_hello(struct spop_conn *spop_conn)
if (unlikely(b_contig_data(dbuf, 0) < spop_conn->dfl)) {
/* Realign the dmux buffer if the frame wraps. It is unexpected
* at this stage because it should be the first record received
* from the FCGI application.
* from the SPOA.
*/
b_slow_realign_ofs(dbuf, trash.area, 0);
}
@ -1824,13 +1824,8 @@ static int spop_conn_handle_disconnect(struct spop_conn *spop_conn)
return 0;
}
if (unlikely(b_contig_data(dbuf, 0) < spop_conn->dfl)) {
/* Realign the dmux buffer if the frame wraps. It is unexpected
* at this stage because it should be the first record received
* from the FCGI application.
*/
if (unlikely(b_contig_data(dbuf, 0) < spop_conn->dfl))
b_slow_realign_ofs(dbuf, trash.area, 0);
}
p = b_head(dbuf);
end = p + spop_conn->dfl;
@ -1936,13 +1931,8 @@ static int spop_conn_handle_ack(struct spop_conn *spop_conn, struct spop_strm *s
return 0;
}
if (unlikely(b_contig_data(dbuf, 0) < spop_conn->dfl)) {
/* Realign the dmux buffer if the frame wraps. It is unexpected
* at this stage because it should be the first record received
* from the FCGI application.
*/
if (unlikely(b_contig_data(dbuf, 0) < spop_conn->dfl))
b_slow_realign_ofs(dbuf, trash.area, 0);
}
spop_conn->flags &= ~SPOP_CF_DEM_SFULL;
rxbuf = spop_get_buf(spop_conn, &spop_strm->rxbuf);