From 1e89c7679174065b4d411df21569bf20773868ec Mon Sep 17 00:00:00 2001 From: Arne Welzel Date: Thu, 15 May 2025 16:44:16 +0200 Subject: [PATCH] Merge remote-tracking branch 'origin/topic/awelzel/bump-ixwebsocket-11.4.6' * origin/topic/awelzel/bump-ixwebsocket-11.4.6: IXWebSocket: Point at upstream, bump to v11.4.6 (cherry picked from commit e40aac30f47b90d93c33f7ff98bdde7b00c5be97) --- .gitmodules | 2 +- CHANGES | 6 ++++++ VERSION | 2 +- src/cluster/websocket/auxil/IXWebSocket | 2 +- 4 files changed, 9 insertions(+), 3 deletions(-) diff --git a/.gitmodules b/.gitmodules index 9eb32420d1..33e7d94136 100644 --- a/.gitmodules +++ b/.gitmodules @@ -81,7 +81,7 @@ url = https://github.com/zeromq/cppzmq [submodule "src/cluster/websocket/auxil/IXWebSocket"] path = src/cluster/websocket/auxil/IXWebSocket - url = https://github.com/zeek/IXWebSocket.git + url = https://github.com/machinezone/IXWebSocket [submodule "auxil/expected-lite"] path = auxil/expected-lite url = https://github.com/martinmoene/expected-lite.git diff --git a/CHANGES b/CHANGES index bb04a99afc..aeaf8b931c 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,9 @@ +7.2.0-7 | 2025-05-19 09:31:58 -0700 + + * IXWebSocket: Point at upstream, bump to v11.4.6 (Arne Welzel, Corelight) + + (cherry picked from commit e40aac30f47b90d93c33f7ff98bdde7b00c5be97) + 7.2.0-6 | 2025-05-19 09:30:50 -0700 * btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight) diff --git a/VERSION b/VERSION index ead2b313a9..d761dfe92e 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.2.0-6 +7.2.0-7 diff --git a/src/cluster/websocket/auxil/IXWebSocket b/src/cluster/websocket/auxil/IXWebSocket index abb632fb0f..2efe037c9c 160000 --- a/src/cluster/websocket/auxil/IXWebSocket +++ b/src/cluster/websocket/auxil/IXWebSocket @@ -1 +1 @@ -Subproject commit abb632fb0f778258e9a8c8c1b3a262f804755fdb +Subproject commit 2efe037c9cc96fd536774f17bdb5215161ee5087