From 7b27410ac97be98d97e1635a17a19286d2666cad Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 3 Jan 2023 17:07:17 +0800 Subject: [PATCH] SRS4: Security: Enable CIDR for allow/deny play/publish. (#2914) PICK 55ca61ec9c1aec75d533508e42ed1e4efab7897b --- trunk/doc/CHANGELOG.md | 1 + trunk/doc/Features.md | 1 + 2 files changed, 2 insertions(+) diff --git a/trunk/doc/CHANGELOG.md b/trunk/doc/CHANGELOG.md index 911ec6f983..9532940977 100644 --- a/trunk/doc/CHANGELOG.md +++ b/trunk/doc/CHANGELOG.md @@ -169,6 +169,7 @@ The changelog for SRS. * v4.0, 2022-03-19, Merge [#2908](https://github.com/ossrs/srs/pull/2908): SRT: url supports multiple QueryStrings (#2908). v4.0.250 * v4.0, 2022-03-17, SRT: Support debug and run with CLion. v4.0.249 * v4.0, 2022-03-15, Merge [#2966](https://github.com/ossrs/srs/pull/2966): Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248 +* v4.0, 2022-03-11, Merge [#2914](https://github.com/ossrs/srs/pull/2914): Security: Enable CIDR for allow/deny play/publish. * v4.0, 2022-03-07, RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 * v4.0, 2022-03-07, SRT: Append vhost to stream, not app. v4.0.246 * v4.0, 2022-02-15, Fix warnings for uuid. v4.0.245 diff --git a/trunk/doc/Features.md b/trunk/doc/Features.md index 4129341ed7..50327aa737 100644 --- a/trunk/doc/Features.md +++ b/trunk/doc/Features.md @@ -6,6 +6,7 @@ The features of SRS. - [x] System: Support native HTTP server([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/sample-http), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/sample-http)) for http api and http live streaming. v2.0.0+ - [x] System: Support DVR([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/dvr), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/dvr)) to record live streaming to FLV file. v1.0.0+ - [x] System: Support security strategy including allow/deny publish/play IP([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/security), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/security)). v1.0.0+ +- [x] System: Security: Enable CIDR for allow/deny play/publish, [#2914](https://github.com/ossrs/srs/pull/2914). v4.0.248+ - [x] System: Support Vhost([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/rtmp-url-vhost), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/rtmp-url-vhost)) and \_\_defaultVhost\_\_. v1.0.0+ - [x] System: Support reloading([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/reload), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/reload)) to apply changes of config. v1.0.0+ - [x] System: Support traceable and session-based log([CN](https://ossrs.net/lts/zh-cn/docs/v4/doc/log), [EN](https://ossrs.io/lts/en-us/docs/v4/doc/log)). v1.0.0+