Tim Wojtulewicz
458b2057c1
Updating CHANGES and VERSION.
2025-07-21 10:20:55 -07:00
Tim Wojtulewicz
2e51e4be72
Update docs submodule [nomail] [skip ci]
2025-07-21 10:20:10 -07:00
Tim Wojtulewicz
a58503ab91
Return weird if a log line is over a configurable size limit
2025-07-21 09:19:44 -07:00
Tim Wojtulewicz
d203b90d71
Update NEWS for 7.2.2 release [skip ci] [nomail]
2025-07-18 16:05:16 -07:00
Tim Wojtulewicz
22036910f0
CI: Remove spicy-head task
2025-07-17 08:49:34 -07:00
Robin Sommer
d375ed09ac
Merge remote-tracking branch 'origin/topic/bbannier/protocol-handle-close-finish'
...
* origin/topic/bbannier/protocol-handle-close-finish:
[Spicy] Let `zeek::protocol_handle_close()` send a TCP EOF.
(cherry picked from commit ce6c7a6cd1
2025-07-17 08:48:51 -07:00
Tim Wojtulewicz
1f1b4a5a77
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-7.2' into release/7.2
...
* origin/topic/bbannier/bump-spicy-7.2:
Bump auxil/spicy to spicy-1.13.2
2025-07-17 08:48:20 -07:00
Benjamin Bannier
848747f6de
Bump auxil/spicy to spicy-1.13.2
2025-07-17 09:27:42 +02:00
Benjamin Bannier
f88d2322d8
Merge branch 'topic/bbannier/bump-pre-commit-hook-spicy-format'
...
(cherry picked from commit 92868804b1
2025-07-16 13:43:22 -07:00
Tim Wojtulewicz
f21b7bdea1
CI: Force opensuse-tumbleweed image to rebuild
2025-07-14 14:46:53 -07:00
Tim Wojtulewicz
551b0abc30
Update ZeekJS to v0.18.0
...
This is primarily to bring in 26c8c3684c46dce2f00b191ed009b1ea9bfe9159.
2025-07-14 14:40:21 -07:00
Arne Welzel
b8171933cc
Merge remote-tracking branch 'origin/topic/vern/ZAM-const-prop-fix'
...
* origin/topic/vern/ZAM-const-prop-fix:
fix for error in ZAM's constant propagation logic
(cherry picked from commit 869bd181b2
2025-07-14 14:33:42 -07:00
Arne Welzel
886fdd7c3a
Merge remote-tracking branch 'origin/topic/bbannier/issue-4594'
...
* origin/topic/bbannier/issue-4594:
Align WebSocket error in cluster with one in Broker
(cherry picked from commit b1157e4e03
2025-07-14 14:32:23 -07:00
Arne Welzel
7cdbbec44c
Merge remote-tracking branch 'origin/topic/awelzel/4586-zeromq-ipv6'
...
* origin/topic/awelzel/4586-zeromq-ipv6:
cluster/zeromq: Short-circuit DoPublishLogWrite() when not initialized
cluster/zeromq: Hook up and enable IPV6 by default
cluster/zeromq/connect: Make failures fatal
cluster/zeromq: Move log_push creation to DoInit()
(cherry picked from commit cab4ebf513
2025-07-14 14:31:12 -07:00
Arne Welzel
8045612bb4
Merge remote-tracking branch 'origin/topic/awelzel/4562-post-proc-lookup-failure'
...
* origin/topic/awelzel/4562-post-proc-lookup-failure:
btest/logging: Fly-by cleanup
logging/Ascii: Fix abort() for non-existing postrotation functions
(cherry picked from commit f4357485d2
2025-07-14 14:30:14 -07:00
Arne Welzel
7abf74e2d3
Merge branch 'topic/ado/final-docker' of https://github.com/edoardomich/zeek
...
* 'topic/ado/final-docker' of https://github.com/edoardomich/zeek :
docker: Add `net-tools` and `procps` dependencies
(cherry picked from commit 8189716adc
2025-07-14 14:27:33 -07:00
Arne Welzel
82a13fc416
Merge remote-tracking branch 'origin/topic/awelzel/4522-bdat-last-reply-fix'
...
* origin/topic/awelzel/4522-bdat-last-reply-fix:
smtp: Fix last_reply column in smtp.log for BDAT LAST
(cherry picked from commit f5063bfcd4
2025-07-14 14:25:47 -07:00
Arne Welzel
2ee2e3b062
Merge remote-tracking branch 'origin/topic/awelzel/4474-cluster-websocket-ipv6'
...
* origin/topic/awelzel/4474-cluster-websocket-ipv6:
IXWebsocket: Bump to version with memset() sock addr fix
cluster/websocket: Deprecate $listen_host, introduce $listen_addr
cluster/websocket-ixwebsocket: Determine proper address_family
(cherry picked from commit f16ebd34b3
2025-07-14 14:20:41 -07:00
Tim Wojtulewicz
5b09f8cb47
Merge remote-tracking branch 'origin/topic/timw/redis-connection-failure'
...
* origin/topic/timw/redis-connection-failure:
Redis: bump version of hiredis required
Redis: return proper error if connection fails
(cherry picked from commit f996f661b6
2025-07-14 14:19:03 -07:00
Tim Wojtulewicz
e1e5e404c3
Fix typo in Spicy version in NEWS
2025-05-20 09:30:25 -07:00
Tim Wojtulewicz
90d7bdb9eb
Update CHANGES, VERSION, and NEWS for 7.2.1 release
2025-05-20 09:12:59 -07:00
Tim Wojtulewicz
cba94ab829
Update docs submodule [nomail]
2025-05-19 12:52:01 -07:00
Tim Wojtulewicz
21a33b4e92
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-7.2' into release/7.2
...
* origin/topic/bbannier/bump-spicy-7.2:
Bump `auxil/spicy` to v1.13.1
2025-05-19 12:34:17 -07:00
Arne Welzel
1e89c76791
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 e40aac30f4
2025-05-19 09:32:16 -07:00
Arne Welzel
4b22c95e53
Merge remote-tracking branch 'origin/topic/awelzel/4440-websocket-pong-timeout'
...
* origin/topic/awelzel/4440-websocket-pong-timeout:
btest/cluster/websocket: Update tests for new event signature
cluster/websocket: Propagate code and reason to websocket_client_lost()
cluster/websocket: Support configurable ping interval
IXWebSocket: Bump to improve O^2 rxbuf erase()
(cherry picked from commit 8f60d37ad0
2025-05-19 09:31:26 -07:00
Tim Wojtulewicz
99945defa6
Update paraglob submodule for GCC 15.1 build fix
2025-05-19 09:30:13 -07:00
Arne Welzel
b377fb1d5a
Merge remote-tracking branch 'origin/topic/awelzel/ci-fedora-42'
...
* origin/topic/awelzel/ci-fedora-42:
probabilistic/BitVector: Add include <cstdint>
Bump spicy to fix build with GCC 15.1
CI: Drop fedora-40
CI: Add fedora-42
(cherry picked from commit 7583651bec
2025-05-19 09:29:36 -07:00
Arne Welzel
b7a937372d
Merge branch 'gcc15' of https://github.com/i2z1/zeek
...
* 'gcc15' of https://github.com/i2z1/zeek :
Include cstdint header to support uint8_t/uint64_t in GCC 15+
(cherry picked from commit 60efc7741d
2025-05-19 09:28:26 -07:00
Arne Welzel
1327b69c81
Merge remote-tracking branch 'origin/topic/vern/zam-aggr-change-in-loop'
...
* origin/topic/vern/zam-aggr-change-in-loop:
fix for ZAM optimization when an aggregate is modified inside of a loop
(cherry picked from commit 2255fa23b8
2025-05-19 09:24:19 -07:00
Benjamin Bannier
876d150a39
Bump auxil/spicy to v1.13.1
2025-05-19 14:55:50 +02:00
Tim Wojtulewicz
bfac90a3c8
Fix 7.2.0 NEWS formatting [nomail] [skip ci]
2025-05-09 08:57:27 -07:00
Tim Wojtulewicz
e76a08524b
Updating CHANGES and VERSION.
2025-05-09 07:29:54 -07:00
Christian Kreibich
61f094e928
Merge branch 'topic/christian/fix-broker-peering-overflows-metric'
...
* topic/christian/fix-broker-peering-overflows-metric:
Bugfix: accurately track Broker buffer overflows w/ multiple peerings
(cherry picked from commit 8d79429555
2025-05-08 15:15:25 -07:00
Tim Wojtulewicz
589f146549
Merge remote-tracking branch 'origin/topic/bbannier/bump-spicy-7.2' into release/7.2
...
* origin/topic/bbannier/bump-spicy-7.2:
Bump auxil/spicy to latest release
2025-05-08 15:13:40 -07:00
Tim Wojtulewicz
9369a6e3dd
Merge branch 'topic/timw/switch-broker-error-to-error'
...
* topic/timw/switch-broker-error-to-error:
Downgrade broker clone FatalError to an Error
(cherry picked from commit 2c17c85f55
2025-05-08 13:48:02 -07:00
Benjamin Bannier
7330606b74
Bump auxil/spicy to latest release
2025-05-08 21:55:04 +02:00
Tim Wojtulewicz
1807710a8c
Update docs submodule [nomail] [skip ci]
2025-05-08 11:00:36 -07:00
Tim Wojtulewicz
6b5b2d1c77
Merge remote-tracking branch 'origin/topic/christian/news-fix'
...
* origin/topic/christian/news-fix:
Fix Broker metrics naming bugs that snuck in w/ last-minute renaming [skip ci]
(cherry picked from commit 507974a1d8
2025-05-07 14:11:33 -07:00
Tim Wojtulewicz
0d70dde10b
Merge remote-tracking branch 'origin/topic/johanna/fix-failed-service-logging'
...
* origin/topic/johanna/fix-failed-service-logging:
Fix policy/protocols/conn/failed-service-logging.zeek
(cherry picked from commit 6f8924596f
2025-05-07 10:34:07 -07:00
Arne Welzel
e326e31d7e
Merge remote-tracking branch 'origin/topic/awelzel/more-terminate-while-queueing-hardening'
...
* origin/topic/awelzel/more-terminate-while-queueing-hardening:
btest/cluster/generic/publish-any: Apply Christian's fix from broker/publish-any
wstest/terminate-while-queueing: Patch close_socket()
(cherry picked from commit 8089f5bed4
2025-05-07 17:26:22 +02:00
Arne Welzel
3ee6a3d6c0
Merge remote-tracking branch 'origin/topic/awelzel/fix-flaky-terminate-while-queueing'
...
* origin/topic/awelzel/fix-flaky-terminate-while-queueing:
cluster/websocket: Stop and wait for reply thread during Terminate()
(cherry picked from commit 135acc7c6d
2025-05-07 14:06:41 +02:00
Arne Welzel
01747191b6
Merge remote-tracking branch 'origin/topic/awelzel/4420-simeon-breaking-websockets'
...
* origin/topic/awelzel/4420-simeon-breaking-websockets:
Websocket: Close onloop during Terminate()
OnLoop: notify_all() instead of notify_one()
(cherry picked from commit 4afb0ffeeb
2025-05-07 11:13:03 +02:00
Tim Wojtulewicz
182641ccc1
Merge remote-tracking branch 'origin/topic/timw/storage-check-redis-server-version'
...
* origin/topic/timw/storage-check-redis-server-version:
Add commands to the static methods for the Redis implementation
Redis: Check server version when connecting
(cherry picked from commit f9aa9a430d
2025-05-06 11:44:00 -07:00
Tim Wojtulewicz
4f683ee1f8
Merge remote-tracking branch 'origin/topic/timw/storage-redis-expire-string-view'
...
* origin/topic/timw/storage-redis-expire-string-view:
Use std::string_view in Redis::DoExpire to avoid copies
(cherry picked from commit 58d71d2fa3
2025-05-05 11:21:40 -07:00
Arne Welzel
99acfc6534
Merge remote-tracking branch 'origin/topic/awelzel/4405-quic-fragmented-crypto'
...
* origin/topic/awelzel/4405-quic-fragmented-crypto:
Bump external/zeek-testing
QUIC: Extract reset_crypto() function
QUIC: Rename ConnectionIDInfo to Context
QUIC: Switch initial_destination_conn_id to optional
QUIC: Use initial destination conn_id for decryption
QUIC: Handle CRYPTO frames across multiple INITIAL packets
QUIC: Do not consume EncryptedLongPacketPayload
QUIC: Fix ACK frame parsing
(cherry picked from commit 50ac8d1468
2025-05-05 11:19:30 -07:00
Tim Wojtulewicz
b3166c9379
Merge remote-tracking branch 'origin/topic/vern/zam-inlining-temps'
...
* origin/topic/vern/zam-inlining-temps:
fixed incorrect ZAM optimization of expressions seen in single-statement inlined functions
(cherry picked from commit e56de061f9
2025-04-29 17:51:34 -07:00
Tim Wojtulewicz
85e2a2fc1e
Merge remote-tracking branch 'origin/topic/timw/update-ct-ca-lists'
...
* origin/topic/timw/update-ct-ca-lists:
External tests: add removed logs to CT list to prevent baseline changes
Update Mozilla CA list and CT list to NSS 3.110
(cherry picked from commit 2cf8497bf7
2025-04-29 08:54:12 -07:00
Arne Welzel
fb443815fa
Fixup CHANGES
2025-04-28 19:55:07 +02:00
Arne Welzel
35140ada29
Merge remote-tracking branch 'origin/topic/awelzel/cluster-coverity-fixes'
...
* origin/topic/awelzel/cluster-coverity-fixes:
broker/WebSocketShim: Check RegisterFd() return
cluster/OnLoop: Fix coverity report about proc accessed without lock
(cherry picked from commit 5bf660a9ce
2025-04-28 19:49:30 +02:00
Arne Welzel
05baf8858b
Merge remote-tracking branch 'origin/topic/awelzel/3045-no-holes-in-vectors'
...
* origin/topic/awelzel/3045-no-holes-in-vectors:
broker/Data/data_to_val: Fail on vectors/lists with holes
(cherry picked from commit 540baa89af
2025-04-28 19:48:05 +02:00
