external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Code Issues Releases Wiki Activity
8195 commits 13 branches 107 tags 375 MiB
Commit graph

8195 commits

This branch
This branch
All branches
Author SHA1 Message Date
winlin
957e952b41 Update authors 2022-02-14 15:30:02 +08:00
winlin
b839c2ea9c Support include directive for config file. (#2878). v5.0.23 2022-02-14 15:20:48 +08:00
mapengfei53
fde44885d9
Support include directive for config file (#2878) 
* Support include import configuration

* Remove support for regular rules

* Remove support for regular rules

* Fix configuration file parsing bug

* Added utest tests for include functionality

* Added utest tests for include functionality

* Modify the UTest function

* optimized code

* Config: Refine parse error with state

* Config: Reorder functions

* Config: Rename parsing type to context

* Config: Refine args for include

* Config: Add utests for include

* Config: Refine code, parsing recursively.

* Config: Change the mock from file to buffer

* Config: Mock buffer in config

* Config: Refine code

* Add utests for include

* Added utest for include

Co-authored-by: pengfei.ma <pengfei.ma@ngaa.com.cn>
Co-authored-by: winlin <winlin@vip.126.com>
 2022-02-14 15:08:51 +08:00
winlin
5e78c1fe88 Update README 2022-02-14 09:41:58 +08:00
winlin
acf0af6b5a Squash: Update 2022-02-13 08:31:10 +08:00
winlin
ede1161df7 Update 2022-02-13 08:28:26 +08:00
winlin
ec89e8af86 Merge branch 'develop' into merge/develop 2022-02-13 08:27:02 +08:00
winlin
8d88a5b4cc Release v4.0-b8, 4.0 beta8, v4.0.241, 144445 lines. 2022-02-11 16:38:11 +08:00
winlin
c2b07ad943 Squash: Fix bugs 2022-02-11 08:44:31 +08:00
winlin
a35b928ccd Update 2022-02-11 08:43:15 +08:00
winlin
44de910338 Merge branch 'develop' into merge/develop 2022-02-09 11:53:32 +08:00
winlin
c9dcee778f Release v4.0-b7, 4.0 beta7, v4.0.240, 144437 lines. 2022-02-09 11:53:06 +08:00
winlin
ff93bdd14f Mirror docker images in TCR Singapore. v4.0.240 2022-02-09 11:42:02 +08:00
winlin
e27b658ef9 Refine the error for WebRTC H5 publisher. v4.0.239 2022-02-08 11:54:04 +08:00
winlin
0e9dc50d11 Support TCR docker images 2022-02-04 15:54:05 +08:00
winlin
5c1556ac74 Squash: Refine release 2022-02-04 09:57:05 +08:00
winlin
0a2c3178ad Refine 2022-02-04 09:55:41 +08:00
winlin
14648b5c2f Merge branch '4.0release' into merge/develop 2022-02-04 09:55:18 +08:00
winlin
4b50badbb8 Merge branch 'develop' into merge/develop 2022-02-04 09:55:14 +08:00
winlin
3c5a527a10 Refine label for release.yml 2022-02-04 09:25:12 +08:00
winlin
b179526de1 Release v4.0-b6, 4.0 beta6, v4.0.238, 144437 lines. 2022-02-04 09:02:05 +08:00
winlin
d1534c099b Push docker to docker, acr and tcr. v4.0.238 2022-02-04 09:01:12 +08:00
winlin
32bb96a5c2 Squash: Fix bugs 2022-02-03 15:16:52 +08:00
winlin
cc556fe921 Merge branch '4.0release' into merge/develop 2022-02-03 15:16:12 +08:00
winlin
56535cd475 Merge branch 'develop' into merge/develop 2022-02-03 15:16:08 +08:00
winlin
dcf565bba1 Fix bug when the value of http header is empty. (#2888). v4.0.237 2022-02-03 15:07:37 +08:00
Haibo Chen
290c3b95a5 Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 2022-02-03 15:06:06 +08:00
Haibo Chen
b94ce1485a
Fix bug when the value of http header is empty (#2888) 
* Fix bug when the value of http header is empty

* add utest
 2022-02-03 15:05:09 +08:00
winlin
a4a231e396 Release v4.0-b5, 4.0 beta5, v4.0.236, 144416 lines. 2022-01-30 22:37:26 +08:00
winlin
1d4fac0dbc Refine docker console, preview by players at the same server. v4.0.236 2022-01-30 22:36:01 +08:00
winlin
ba0b62fd37 For docker, always use the console for logging. v4.0.235 2022-01-30 22:01:21 +08:00
winlin
bdf6540c89 SRT: Reduce the SRT bug by limit the max times for retry. (#2896). v4.0.234 2022-01-29 15:08:56 +08:00
Alex.CR
0c036e0435
SRT: Reduce the SRT bug by limit the max times for retry. 2022-01-29 15:07:01 +08:00
winlin
6b7fc6fdb5 Squash: Fix bugs for 4.0 2022-01-23 08:12:19 +08:00
winlin
ded338ce47 Merge branch '4.0release' into merge/develop 2022-01-23 08:11:27 +08:00
winlin
03acf80dbf Merge branch 'develop' into merge/develop 2022-01-23 08:11:23 +08:00
winlin
339d942e7b Fix bug when free addrinfo. (#2886). v4.0.233 2022-01-23 08:09:37 +08:00
winlin
8f2d23ff73 Fix memory leak in SrsMetaCache. (#2887). v4.0.232 2022-01-23 08:09:20 +08:00
winlin
6c6c0f0f0f Support docker image for lighthouse. v4.0.231 2022-01-23 08:06:48 +08:00
stone
386ac44558
bugfix: SrsAutoFree addrinfo (#2886) 
* bugfix: SrsAutoFree addrinfo

* bugfix: SrsAutoFreeH(addrinfo, r, freeaddrinfo)

Co-authored-by: wanglei <wanglei@unicloud.com>
 2022-01-23 07:18:16 +08:00
stone
92434cfeba
bugfix:SrsMetaCache memleak (#2887) 
Co-authored-by: wanglei <wanglei@unicloud.com>
 2022-01-22 18:50:10 +08:00
winlin
ccc1e75f24 Update contribute guide 2022-01-19 19:04:14 +08:00
winlin
7c9f88be0b Eliminate unused *.as files for Adobe Flash. v5.0.22 2022-01-18 12:04:15 +08:00
winlin
0b87950073 Update README 2022-01-18 12:01:48 +08:00
winlin
12ffddd363 Release v5.0.21 2022-01-17 21:43:47 +08:00
winlin
bd88df9ba8 Merge branch '4.0release' into merge/develop 2022-01-17 21:43:17 +08:00
winlin
d996aea7b9 Update 2022-01-17 21:43:13 +08:00
winlin
dc43a11aed Enable rtmp2rtc and rtc2rtmp for docker.conf 2022-01-17 21:37:57 +08:00
winlin
ce5db9a040 Release v5.0.21 2022-01-17 15:06:21 +08:00
winlin
4bd4f4ad99 Merge 2022-01-17 14:41:44 +08:00