Mirror/zeek
1
0
Fork 0
mirror of https://github.com/zeek/zeek.git synced 2025-10-02 06:38:20 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge remote-tracking branch 'origin/topic/awelzel/bump-ixwebsocket-11.4.6'

Browse source 
* origin/topic/awelzel/bump-ixwebsocket-11.4.6:
  IXWebSocket: Point at upstream, bump to v11.4.6

(cherry picked from commit e40aac30f4)
This commit is contained in:
Arne Welzel 2025-05-15 16:44:16 +02:00 • committed by Tim Wojtulewicz
parent 4b22c95e53
commit 1e89c76791
4 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.gitmodules vendored
View file

@ -81,7 +81,7 @@
url = https://github.com/zeromq/cppzmq url = https://github.com/zeromq/cppzmq
[submodule "src/cluster/websocket/auxil/IXWebSocket"] [submodule "src/cluster/websocket/auxil/IXWebSocket"]
path = 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"] [submodule "auxil/expected-lite"]
path = auxil/expected-lite path = auxil/expected-lite
url = https://github.com/martinmoene/expected-lite.git url = https://github.com/martinmoene/expected-lite.git

6
CHANGES
View file

@ -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 7.2.0-6 | 2025-05-19 09:30:50 -0700
* btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight) * btest/cluster/websocket: Update tests for new event signature (Arne Welzel, Corelight)

2
VERSION
View file

@ -1 +1 @@
7.2.0-6 7.2.0-7

2
src/cluster/websocket/auxil/IXWebSocket

@ -1 +1 @@
Subproject commit abb632fb0f778258e9a8c8c1b3a262f804755fdb Subproject commit 2efe037c9cc96fd536774f17bdb5215161ee5087