1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 20:01:56 +00:00
Commit graph

8056 commits

Author SHA1 Message Date
winlin
b3baa888ee RTC: Refine player sdk, directly use raw HTTP. 2022-04-08 23:02:32 +08:00
Winlin
1a6d94abcd
Update SECURITY.md 2022-04-07 13:56:53 +08:00
Winlin
ebed253db7
Create SECURITY.md 2022-04-07 13:54:39 +08:00
winlin
16babd2b64 Merge branch '4.0release' into develop 2022-04-07 13:48:59 +08:00
winlin
1d503c770f Fix proc stat issue. 2022-04-07 13:48:19 +08:00
winlin
e14c3a946d Update README. 2022-04-06 17:15:34 +08:00
winlin
1e2f8dc299 Update README for single node architecture. 2022-04-06 17:01:22 +08:00
winlin
2d50fb0882 Update LICENSE. 2022-04-06 13:03:32 +08:00
winlin
3bc17488bc Update SRS 4.0 single node arch. 2022-04-05 11:11:25 +08:00
winlin
d38b8fcf1d Update SRS 4.0 single node arch. 2022-04-05 11:00:06 +08:00
winlin
5470c177b5 Merge branch '4.0release' into develop 2022-04-04 16:49:53 +08:00
winlin
f87a959480 Support NGINX HLS Cluster. 2022-04-04 16:49:15 +08:00
winlin
4163dce18d Support NGINX HLS Cluster. v5.0.28 2022-04-04 13:45:49 +08:00
winlin
101d1ffbbf Support DigitalOcean Droplet SRS 1-Click. v5.0.27 2022-03-30 12:39:56 +08:00
winlin
1463192763 Refine README. 2022-03-23 10:36:58 +08:00
mapengfei53
8dc5853f8c
Fix parse_file function did not handle err (#2928)
* Fix parse file function did not handle err

* Fix parse_file function did not handle err

* Fix error message

* Updated error information
2022-03-19 13:22:27 +08:00
winlin
9385f2b80b Merge branch '4.0release' into develop 2022-03-19 13:21:58 +08:00
winlin
dbfa761aed Release v4.0-b10, 4.0 beta10, v4.0.251, 144665 lines. 2022-03-19 13:04:06 +08:00
winlin
76ed0200b4 SRT: Decouple publish with play url (#2893). v4.0.251 2022-03-19 12:06:07 +08:00
winlin
41e35155f7 SRT: Compatible with previous auth querystring. #2908 2022-03-19 09:04:51 +08:00
loveforever
210cdf04be
SRT: url supports multiple QueryStrings (#2908)
* SRT:  parse srt url to supports multiple QueryStrings.(#2893)

* SRT:  url supports multiple QueryStrings by  comma-separated key-value pairs with no nesting  (#2893)

* SRT:  url supports multiple QueryStrings by comma-separated key-value pairs with no nesting  (#2893)

* SRT: Add comments for url.

* Add utest for SRT URL parsing.

* Update README.

Co-authored-by: winlin <winlin@vip.126.com>
2022-03-19 08:24:06 +08:00
winlin
c225c3f745 Merge branch '4.0release' into develop 2022-03-18 12:03:52 +08:00
winlin
06cff31b24 Update script. 2022-03-18 12:02:49 +08:00
winlin
fd219aa074 Refine utest script. 2022-03-18 12:01:11 +08:00
Winlin
350c05c589
UTest: Upgrade gtest to 1.11 and support clion. (#2970) 2022-03-17 16:56:52 +08:00
winlin
90bc56b36f Update PR template. 2022-03-17 11:53:31 +08:00
winlin
c5cc79ee6f SRT: Support debug and run with CLion. v4.0.249 2022-03-17 08:42:44 +08:00
winlin
3998a88cc9 Update README for mermaid. 2022-03-15 14:25:09 +08:00
winlin
0008927d76 Update README for FOSSA. 2022-03-15 14:19:41 +08:00
winlin
b0463c2a4d Update README for FOSSA. 2022-03-15 13:51:27 +08:00
winlin
8703957595 Update README for FOSSA LICNESE scan. 2022-03-15 13:48:41 +08:00
winlin
61f1531aa3 Merge branch '4.0release' into develop 2022-03-15 08:48:26 +08:00
ChenGH
ab81696102 Bugfix: Fix rtcp nack blp encode bug (#2966). v4.0.248
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:43:03 +08:00
ChenGH
70aa6b66bb
bugfix: fix rtcp nack blp encode bug (#2966)
Co-authored-by: Winlin <winlin@vip.126.com>
2022-03-15 08:40:06 +08:00
winlin
636066124a SRT: Fix typo in libsrt build options. v5.0.26 2022-03-12 18:37:41 +08:00
everything411
d6ead6c0c5
SRT: Fix typo in libsrt build options (#2943)
the cmake option is ENABLE_APPS, so we should use --disable-apps or --enable-apps=0. this commit fixes the typo.
2022-03-12 18:34:30 +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
winlin
451b01011c Merge SRS 4.0 for bugfix. v5.0.25 2022-03-09 08:09:27 +08:00
winlin
9d3ae5c8ed Merge branch '4.0release' into develop 2022-03-09 08:06:56 +08:00
winlin
e26db694ca RTC: Identify the WebRTC publisher in param for hooks. v4.0.247 2022-03-07 16:34:51 +08:00
winlin
107ca2cbb8 SRT: Append vhost to stream, not app. v4.0.246 2022-03-07 15:53:55 +08:00
CommanderRoot
8a75e8a165
Replace deprecated String.prototype.substr() (#2948)
String.prototype.substr() is deprecated (see https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/String/substr) so we replace it with slice() or substring() which work similarily but aren't deprecated.
Signed-off-by: Tobias Speicher <rootcommander@gmail.com>
2022-03-07 08:02:27 +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
winlin
75cf9b3d19 Add single node architecture 2022-03-03 09:40:50 +08:00
winlin
95bbb5a0c3 Update README 2022-02-28 20:26:55 +08:00
Matthew
526cd62075
Fix FD leak when exceed max connections limit. (#2925)
* fix fd leak

when tcp connection exceed max_connection, that connection will leak because of not closing the fd

* fix leak, code refine
2022-02-26 07:50:09 +08:00
winlin
4b838659e9 Merge 4.0release, update AUTHORS 2022-02-18 12:45:22 +08:00
winlin
4b737f010f Merge branch 'merge/develop' into develop 2022-02-18 12:43:58 +08:00
winlin
e222f0da1b Add active developers 2022-02-16 13:16:18 +08:00
winlin
88c8a4f6c0 Squash: Bug fixed 2022-02-16 11:34:05 +08:00