From c383fb6db2a604a0534420504ee703f62bdb602b Mon Sep 17 00:00:00 2001 From: Tim Wojtulewicz Date: Mon, 6 Jun 2022 09:38:59 -0700 Subject: [PATCH] Remove duplicate entry about websockets from 5.0 NEWS (cherry picked from commit 5668a6a6de9fc583e7e0f5ecae94c14d853dc626) --- CHANGES | 6 ++---- NEWS | 13 ++++--------- 2 files changed, 6 insertions(+), 13 deletions(-) diff --git a/CHANGES b/CHANGES index 48c35dfa9e..a8abab6a9e 100644 --- a/CHANGES +++ b/CHANGES @@ -1,13 +1,11 @@ 5.0.0-rc1 | 2022-06-03 12:09:34 -0700 + * Remove duplicate entry about websockets from 5.0 NEWS (Tim Wojtulewicz, Corelight) + * NEWS updates for 5.0 (Vern Paxson, Corelight) * ZAM test suite updates due to recent changes (Vern Paxson, Corelight) - * Update submodules [nomail] (Tim Wojtulewicz, Corelight) - - * Updating submodule(s) [nomail] (Tim Wojtulewicz, Corelight) - 5.0.0-dev.575 | 2022-06-03 10:55:47 -0700 * Management framework: bump external cluster testsuite (Christian Kreibich, Corelight) diff --git a/NEWS b/NEWS index 3a1a4242f5..b841298f08 100644 --- a/NEWS +++ b/NEWS @@ -80,9 +80,10 @@ New Functionality - Zeek now provides WebSocket support for exchanging events with external clients. To enable it, call `Broker::listen_websocket()`. Zeek will then - start listening on port 9997 for incoming WebSocket connections. See the - Broker documentation for a description of the message format expected over - these WebSocket connections. + start listening on port 9997 for incoming WebSocket connections. Zeek/Broker + communicates via JSON messages. See the Broker documentation for a description + of the message format expected over these WebSocket connections at + https://docs.zeek.org/projects/broker/en/current/web-socket.html. - Compiling scripts to C++ (via ``-O gen-C++``) is now "feature complete", i.e., the compiler should be able to process any script - other than those @@ -125,12 +126,6 @@ New Functionality - The ``base/misc/installation.zeek`` script provides your Zeek installation's key directories. -- Broker now allows clients to connect as lightweight peers via WebSocket. Zeek - scripts may expose a WebSocket port by calling - `Broker::listen_websocket`. Zeek/Broker communicates via JSON messages, the - format is documented here: - https://docs.zeek.org/projects/broker/en/current/web-socket.html - Changed Functionality ---------------------