400 commits

Author	SHA1	Message	Date
winlin	6a108fab6d	Fix #2837: Callback: Support stream_url and stream_id. v5.0.55	2022-08-31 08:00:05 +08:00
winlin	457738f6eb	Fix #2881: HTTP: Support merging api to server. v5.0.47	2022-08-28 13:11:31 +08:00
winlin	d39995cc31	HLS: Enable hls_ctx by default.	2022-08-27 19:41:07 +08:00
ChenHaibo	2c569f568c	HLS: Support config hls_ctx to disable HLS streaming.	2022-08-27 19:41:07 +08:00
winlin	5757950860	Merge 4.0release	2022-08-26 11:42:29 +08:00
winlin	cdccdf70b8	Hooks: Remove on_connect and on_close from doc.	2022-08-26 10:39:00 +08:00
winlin	18d25eacfb	Merge 4.0release	2022-08-24 19:26:47 +08:00
winlin	95cd0e84eb	Log: Support write log to tencentcloud CLS. v5.0.44	2022-08-24 15:51:23 +08:00
winlin	3da0b57121	Merge 4.0release.	2022-08-24 15:27:56 +08:00
winlin	9923c749d4	STAT: Support config server_id and generate one if empty. v4.0.257	2022-08-24 15:06:43 +08:00
winlin	f7280399d4	Merge 4.0release, migrate to new website.	2022-07-31 18:34:18 +08:00
winlin	d57e9c758e	Docs: Migrate to ossrs.net and ossrs.io	2022-07-31 16:26:35 +08:00
winlin	b2e083b00d	Support multiple threads by thread pool. v5.0.32	2022-06-29 20:15:44 +08:00
winlin	e05535267b	Disable reload for log config.	2022-06-29 19:29:50 +08:00
hondaxiao	fbc6eebe18	SRT: remove rtmp_to_srt	2022-06-14 20:02:25 +08:00
hondaxiao	59d9cdbe61	SRT: add option peer_idle_timeout in full.conf	2022-06-14 20:02:24 +08:00
hondaxiao	a929f79d2c	SRT: Add SRT option annotation in full.conf	2022-06-14 20:02:24 +08:00
winlin	3616c9976a	SRT: Add srt vhost section to full.conf.	2022-06-14 20:02:24 +08:00
winlin	ef553b571c	SRT: Update full.conf for review.	2022-06-14 20:02:24 +08:00
winlin	bda0268a37	SRT: Update full.conf for new configs.	2022-06-14 20:02:24 +08:00
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>	2022-03-11 12:24:35 +08:00
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	2022-03-05 17:43:20 +08:00
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.	2022-02-16 10:49:16 +08:00
winlin	4110fb14cb	Squash: Fix bugs. v5.0.20	2022-01-11 08:40:37 +08:00
winlin	fbb6d9464c	Discover api server and ip as candidates. v4.0.218	2022-01-04 22:31:27 +08:00
winlin	7808bd7ca8	Support config in_docker to fix the detect fail. (#2824). v4.0.216	2022-01-03 16:55:52 +08:00
winlin	716e578a19	Squash: Fix bugs	2021-12-26 17:30:51 +08:00
winlin	faf5fb0a83	Refine the config	2021-12-24 10:37:58 +08:00
winlin	66435d583a	Squash: Fix stat bug	2021-11-15 20:39:35 +08:00
winlin	f3380d2ec0	Fix bug for CPU arch info	2021-11-15 20:35:20 +08:00
winlin	b874d9c9ba	Squash: Merge SRS 4.0, regression test for RTMP.	2021-10-12 08:36:24 +08:00
winlin	71ed6e5dc5	RTC: Refine config, aac to rtmp_to_rtc, bframe to keep_bframe. v4.0.174	2021-10-11 22:14:45 +08:00
winlin	fe9e43b6d4	RTC: Refine config for RTC	2021-10-11 16:36:05 +08:00
winlin	f8b4121497	Test: Add Multiple Sequence test for RTMP	2021-10-11 08:04:12 +08:00
winlin	0f9b9505a8	RTC: Change rtc.aac to discard by default. v4.0.172	2021-10-10 17:17:14 +08:00
winlin	a81aa2edc5	Squash: Merge SRS 4.0	2021-10-10 12:05:26 +08:00
winlin	2fa5a0bee8	Fix #2304, Remove Push RTSP feature. v4.0.171	2021-10-10 11:50:07 +08:00
winlin	df53c801b2	For #2653: Update config for HTTP RAW API removed.	2021-10-10 10:28:19 +08:00
winlin	28e3a1ca69	Squash: Merge SRS 4.0	2021-09-13 09:57:47 +08:00
winlin	501b3833a1	RTMP: Remove bandwidth test	2021-09-13 09:41:21 +08:00
winlin	19c0a9eb4b	Suqash: Merge 4.0	2021-09-05 14:17:41 +08:00
winlin	90b5ed2202	For #2282, #2181, Remove reload for dvr_apply. 4.0.160	2021-09-04 12:29:07 +08:00
winlin	24431d35ac	Squash: Merge SRS4	2021-08-13 14:29:32 +08:00
matthew1838	452ca7e88f	add server_id into http_hooks (#2521) ... Co-authored-by: SK <liemlhd@LiemLes-Mac-Pro.local>	2021-08-11 10:38:22 +08:00
winlin	5ee20613ca	Squash: Support query lastest available version. 5.0.6	2021-06-28 07:33:24 +08:00
winlin	da763e43d5	Squash for #2424, query the latest available version. 4.0.132	2021-06-27 08:56:41 +08:00
winlin	efdbf37255	Squash: Move GB28181 to feature/gb28181. 5.0.4	2021-06-16 14:03:55 +08:00
winlin	68c48e27f5	Change GB28181 to feature/gb28181. 4.0.127	2021-06-16 08:27:37 +08:00
winlin	34aa11b72a	SquashSRS4: Update doc	2021-05-18 11:47:50 +08:00
winlin	0d14c4b073	System: Fail if use use full.conf	2021-05-18 11:06:14 +08:00