Commit Graph

399 Commits (9c6774b644fc805a666458a6557d0cf6c2fdb12c)

Author SHA1 Message Date
winlin 457738f6eb Fix #2881: HTTP: Support merging api to server. v5.0.47 2 years ago
winlin d39995cc31 HLS: Enable hls_ctx by default. 2 years ago
ChenHaibo 2c569f568c HLS: Support config hls_ctx to disable HLS streaming. 2 years ago
winlin 5757950860 Merge 4.0release 2 years ago
winlin cdccdf70b8 Hooks: Remove on_connect and on_close from doc. 2 years ago
winlin 18d25eacfb Merge 4.0release 2 years ago
winlin 95cd0e84eb Log: Support write log to tencentcloud CLS. v5.0.44 2 years ago
winlin 3da0b57121 Merge 4.0release. 2 years ago
winlin 9923c749d4 STAT: Support config server_id and generate one if empty. v4.0.257 2 years ago
winlin f7280399d4 Merge 4.0release, migrate to new website. 3 years ago
winlin d57e9c758e Docs: Migrate to ossrs.net and ossrs.io 3 years ago
winlin b2e083b00d Support multiple threads by thread pool. v5.0.32 3 years ago
winlin e05535267b Disable reload for log config. 3 years ago
hondaxiao fbc6eebe18 SRT: remove rtmp_to_srt 3 years ago
hondaxiao 59d9cdbe61 SRT: add option peer_idle_timeout in full.conf 3 years ago
hondaxiao a929f79d2c SRT: Add SRT option annotation in full.conf 3 years ago
winlin 3616c9976a SRT: Add srt vhost section to full.conf. 3 years ago
winlin ef553b571c SRT: Update full.conf for review. 3 years ago
winlin bda0268a37 SRT: Update full.conf for new configs. 3 years ago
Haibo Chen 67ccd589c1
Security: Enable CIDR for allow/deny play/publish (#2914)
* protocol/utility: add srs_ipv4_to_num

* protocol/utility: add srs_ipv4_within_mask

* protocol/utility: add srs_get_cidr_mask and CIDR_VALUES static struct

* protocol/utility: add srs_get_cidr_ipv4

* app/security: support cidr ip ranges in allow/deny rules

* conf: update security example with cidr ranges

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* Security: Enable CIDR for allow/deny play/publish

* fix compile error on centos6

Co-authored-by: Matheus Macabu <macabu.matheus@gmail.com>
3 years ago
mapengfei53 84951cbc74
Update the demo config file for include directive (#2927)
* Update the demo config file for include directive

* update config file

* update config file
3 years ago
chundonglinlin 03cf93fc2b
Forward: support config full rtmp url forward to other server (#2799)
* Forward: add backend config and demo server for dynamic create forwarder to other server.(#1342)

* Forward: if call forward backend failed, then return directly.

* Forward: add API description and change return value format.

* Forward: add backend conf file and wrapper function for backend service.

* Forward: add backend comment in full.conf and update forward.backend.conf.

* Forward: rename backend param and add comment tips.
3 years ago
winlin 4110fb14cb Squash: Fix bugs. v5.0.20 3 years ago
winlin fbb6d9464c Discover api server and ip as candidates. v4.0.218 3 years ago
winlin 7808bd7ca8 Support config in_docker to fix the detect fail. (#2824). v4.0.216 3 years ago
winlin 716e578a19 Squash: Fix bugs 3 years ago
winlin faf5fb0a83 Refine the config 3 years ago
winlin 66435d583a Squash: Fix stat bug 3 years ago
winlin f3380d2ec0 Fix bug for CPU arch info 3 years ago
winlin b874d9c9ba Squash: Merge SRS 4.0, regression test for RTMP. 3 years ago
winlin 71ed6e5dc5 RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174 3 years ago
winlin fe9e43b6d4 RTC: Refine config for RTC 3 years ago
winlin f8b4121497 Test: Add Multiple Sequence test for RTMP 3 years ago
winlin 0f9b9505a8 RTC: Change rtc.aac to discard by default. v4.0.172 3 years ago
winlin a81aa2edc5 Squash: Merge SRS 4.0 3 years ago
winlin 2fa5a0bee8 Fix #2304, Remove Push RTSP feature. v4.0.171 3 years ago
winlin df53c801b2 For #2653: Update config for HTTP RAW API removed. 3 years ago
winlin 28e3a1ca69 Squash: Merge SRS 4.0 3 years ago
winlin 501b3833a1 RTMP: Remove bandwidth test 3 years ago
winlin 19c0a9eb4b Suqash: Merge 4.0 3 years ago
winlin 90b5ed2202 For #2282, #2181, Remove reload for dvr_apply. 4.0.160 3 years ago
winlin 24431d35ac Squash: Merge SRS4 4 years ago
matthew1838 452ca7e88f
add server_id into http_hooks (#2521)
Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>
4 years ago
winlin 5ee20613ca Squash: Support query lastest available version. 5.0.6 4 years ago
winlin da763e43d5 Squash for #2424, query the latest available version. 4.0.132 4 years ago
winlin efdbf37255 Squash: Move GB28181 to feature/gb28181. 5.0.4 4 years ago
winlin 68c48e27f5 Change GB28181 to feature/gb28181. 4.0.127 4 years ago
winlin 34aa11b72a SquashSRS4: Update doc 4 years ago
winlin 0d14c4b073 System: Fail if use use full.conf 4 years ago
winlin e3bca883e1 SuqashSRS4: Build SRT native 4 years ago