mirrors/haproxy
1
0
Fork 0
mirror of https://git.haproxy.org/git/haproxy.git/ synced 2026-01-25 12:01:10 +01:00
Code Issues Projects Releases Wiki Activity

MINOR: mux-h2: consistently rely on the htx variable to detect the mode

Browse Source 
In h2_frt_transfer_data(), we support both HTX and legacy modes. The
HTX mode is detected from the proxy option and sets a valid pointer
into the htx variable. Better rely on this variable in all the function
rather than testing the option again. This way the code is clearer and
even the compiler knows this pointer is valid when it's dereferenced.

This should be backported to 1.9 if the b_is_null() patch is backported.
This commit is contained in:
Willy Tarreau 2019-01-31 07:23:00 +01:00
parent e5fcfbed5c
commit a9b7796862
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/mux_h2.c
View File

@ -3524,7 +3524,7 @@ try_again:
goto fail;
}
if (h2c->proxy->options2 & PR_O2_USE_HTX) {
if (htx) {
block1 = htx_free_data_space(htx);
if (!block1) {
h2c->flags |= H2_CF_DEM_SFULL;