From a9d1b2990f2f6fdd17bc53237c40e26759cde1da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= Date: Sat, 1 Jun 2024 14:34:41 +0200 Subject: [PATCH] relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure --- ChangeLog.adoc | 8 ++++++++ src/plugins/relay/relay-websocket.c | 4 ++-- tests/unit/plugins/relay/test-relay-http.cpp | 6 +++--- tests/unit/plugins/relay/test-relay-websocket.cpp | 2 +- 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/ChangeLog.adoc b/ChangeLog.adoc index 835ad3dca..023ee7688 100644 --- a/ChangeLog.adoc +++ b/ChangeLog.adoc @@ -8,6 +8,14 @@ :see-release-notes: If you are upgrading: please see release notes. :breaking: pass:quotes[*[breaking]*] +[[v4.3.2]] +== Version 4.3.2 (under dev) + +[[v4.3.2_fixed]] +=== Fixed + +* relay: fix allocation and reinit of field "client_context_takeover" in websocket deflate structure + [[v4.3.1]] == Version 4.3.1 (2024-05-31) diff --git a/src/plugins/relay/relay-websocket.c b/src/plugins/relay/relay-websocket.c index 7da984adb..69b7aa93e 100644 --- a/src/plugins/relay/relay-websocket.c +++ b/src/plugins/relay/relay-websocket.c @@ -49,7 +49,7 @@ relay_websocket_deflate_alloc () new_ws_deflate->enabled = 0; new_ws_deflate->server_context_takeover = 0; - new_ws_deflate->server_context_takeover = 0; + new_ws_deflate->client_context_takeover = 0; new_ws_deflate->window_bits_deflate = 0; new_ws_deflate->window_bits_inflate = 0; new_ws_deflate->strm_deflate = NULL; @@ -145,7 +145,7 @@ relay_websocket_deflate_reinit (struct t_relay_websocket_deflate *ws_deflate) { ws_deflate->enabled = 0; ws_deflate->server_context_takeover = 0; - ws_deflate->server_context_takeover = 0; + ws_deflate->client_context_takeover = 0; ws_deflate->window_bits_deflate = 0; ws_deflate->window_bits_inflate = 0; relay_websocket_deflate_free_stream_deflate (ws_deflate); diff --git a/tests/unit/plugins/relay/test-relay-http.cpp b/tests/unit/plugins/relay/test-relay-http.cpp index 36536ccb6..f35638e5b 100644 --- a/tests/unit/plugins/relay/test-relay-http.cpp +++ b/tests/unit/plugins/relay/test-relay-http.cpp @@ -103,7 +103,7 @@ TEST(RelayHttp, RequestAllocReinitFree) CHECK(request->ws_deflate); LONGS_EQUAL(0, request->ws_deflate->enabled); LONGS_EQUAL(0, request->ws_deflate->server_context_takeover); - LONGS_EQUAL(0, request->ws_deflate->server_context_takeover); + LONGS_EQUAL(0, request->ws_deflate->client_context_takeover); LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate); LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate); POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate); @@ -146,7 +146,7 @@ TEST(RelayHttp, RequestAllocReinitFree) CHECK(request->ws_deflate); LONGS_EQUAL(0, request->ws_deflate->enabled); LONGS_EQUAL(0, request->ws_deflate->server_context_takeover); - LONGS_EQUAL(0, request->ws_deflate->server_context_takeover); + LONGS_EQUAL(0, request->ws_deflate->client_context_takeover); LONGS_EQUAL(0, request->ws_deflate->window_bits_deflate); LONGS_EQUAL(0, request->ws_deflate->window_bits_inflate); POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate); @@ -565,7 +565,7 @@ TEST(RelayHttp, ParseHeader) CHECK(request->ws_deflate); LONGS_EQUAL(1, request->ws_deflate->enabled); LONGS_EQUAL(1, request->ws_deflate->server_context_takeover); - LONGS_EQUAL(1, request->ws_deflate->server_context_takeover); + LONGS_EQUAL(1, request->ws_deflate->client_context_takeover); LONGS_EQUAL(15, request->ws_deflate->window_bits_deflate); LONGS_EQUAL(15, request->ws_deflate->window_bits_inflate); POINTERS_EQUAL(NULL, request->ws_deflate->strm_deflate); diff --git a/tests/unit/plugins/relay/test-relay-websocket.cpp b/tests/unit/plugins/relay/test-relay-websocket.cpp index 38799c059..d54a70ab8 100644 --- a/tests/unit/plugins/relay/test-relay-websocket.cpp +++ b/tests/unit/plugins/relay/test-relay-websocket.cpp @@ -62,7 +62,7 @@ TEST(RelayWebsocket, DeflateAllocFree) ws_deflate = relay_websocket_deflate_alloc (); LONGS_EQUAL(0, ws_deflate->enabled); LONGS_EQUAL(0, ws_deflate->server_context_takeover); - LONGS_EQUAL(0, ws_deflate->server_context_takeover); + LONGS_EQUAL(0, ws_deflate->client_context_takeover); LONGS_EQUAL(0, ws_deflate->window_bits_deflate); LONGS_EQUAL(0, ws_deflate->window_bits_inflate); POINTERS_EQUAL(NULL, ws_deflate->strm_deflate);