external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity
8526 commits 14 branches 107 tags 377 MiB
Commit graph

118 commits

Author SHA1 Message Date
chundonglinlin
733aeaa641
API: Add service_id for http_hooks, which identify the process, v6.0.28, v5.0.142 (#3424) 
Co-authored-by: Winlin <winlin@vip.126.com>
Co-authored-by: Haibo Chen <495810242@qq.com>
 2023-02-25 08:42:19 +08:00
winlin
c46ef81ff2 SRS5: Update license date to 2023. v5.0.123 
PICK 72f8ed4916
 2023-01-01 08:56:20 +08:00
winlin
5bae930621 Fix #3215: Callback: Fix bug for response string 0. v5.0.88 2022-11-18 23:02:59 +08:00
winlin
6a108fab6d Fix #2837: Callback: Support stream_url and stream_id. v5.0.55 2022-08-31 08:00:05 +08:00
winlin
d117145b95 Update date from 2021 to 2022. 2022-06-20 19:22:25 +08:00
winlin
fa78cf3354 Prefix with srs_protocol in protocol directory. 2022-06-09 20:26:58 +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
d5c86dc5fa Switch LICENSE from MIT to **MIT or MulanPSL-2.0**. v5.0.21 2022-01-13 18:40:22 +08:00
Haibo Chen
88cdba6965
STAT: Add server_id into http_hooks (#2692) 2021-10-25 14:11:15 +08:00
winlin
a81aa2edc5 Squash: Merge SRS 4.0 2021-10-10 12:05:26 +08:00
winlin
7ab3e4a86c Squash: Merge SRS 4.0 2021-08-28 09:03:06 +08:00
winlin
24431d35ac Squash: Merge SRS4 2021-08-13 14:29:32 +08:00
Winlin
c8a1e0f3da
Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8 (#2464) 
* Refine AUTHORS.txt to AUTHORS.md, etc. 5.0.8

* Update README.md

* Update README.md

* Refine format for AUTHORS.md
 2021-07-08 14:30:47 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
8b74c7cb89 SquashSRS4: Happy 2021 2021-04-16 09:29:43 +08:00
winlin
d552a1a5fb For #1657, support HTTPS client, for http-callback. 4.0.45 2020-11-03 15:45:52 +08:00
winlin
a826926073 SRS: Fix bug 2020-08-21 21:14:18 +08:00
winlin
6624b8acca Log: Use object as context id for complex context 2020-07-05 23:26:55 +08:00
winlin
8a0c2e01f8 Log: Change cid from int to string 2020-06-18 11:45:43 +08:00
winlin
d783a12f89 Happy 2020 2019-12-30 10:10:35 +08:00
winlin
7eccc9da26 For #1508, support chunk length and content in multiple parts. 2019-12-24 14:58:35 +08:00
winlin
130c545f9a Refine origin cluster log 2019-10-04 06:51:15 +08:00
winlin
522cbf1df8 Refine SrsHourGlass in time unit. 2019-04-18 08:11:16 +08:00
winlin
5505eceeac Refine SrsTcpClient.timeout in time unit. 2019-04-18 07:43:51 +08:00
winlin
a1398892d0 Refine const timeouts in time unit 2019-04-17 08:08:31 +08:00
winlin
980c32aee6 Refine on_hls duration in time unit 2019-04-15 07:53:29 +08:00
winlin
9b7c0802a9 Refine srs_update_system_time in time unit 2019-04-10 08:32:46 +08:00
winlin
6239dfa489 Apply time unit 2019-04-07 16:25:52 +08:00
winlin
b2d1d84634 Change to 2019 2019-01-01 21:37:28 +08:00
winlin
29b74c7220 For #1110, Support params in http callback. 3.0.36 2018-08-04 19:51:04 +08:00
winlin
c70421e656 Fix #464, support origin cluster 2018-02-16 16:39:07 +08:00
winlin
ca1395a807 Change date from 2017 to 2018 2018-01-07 10:58:53 +08:00
winlin
6eae93258a For #913, APP support complex error. 2018-01-01 19:39:57 +08:00
winlin
20a42599f3 For #913, http callback use complex error 2017-09-22 19:54:50 +08:00
winlin
54411e0768 Fix #904, replace NXJSON(LGPL) with json-parser(BSD). 3.0.23 2017-05-30 07:40:18 +08:00
winlin
0a57a46016 Refine LICENSE 2017-03-25 21:29:29 +08:00
winlin
f32aab3d92 For #299, refine code. 2017-03-25 17:21:39 +08:00
winlin
a1fcf66f32 for #742, always enable http utilities. 2017-01-23 17:43:59 +08:00
winlin
3fe338d1c5 for #742, use ms for application clock tbn. 2017-01-17 12:25:30 +08:00
winlin
7ac932cfa0 update to 2013-2017 2016-12-16 11:57:25 +08:00
winlin
eac5440559 merge from srs2 #558 #559 2016-01-09 16:06:22 +08:00
flowerwrong
d42a58faf4 Keep blank of line 2016-01-09 15:10:24 +08:00
flowerwrong
9ddd0054a1 Add tcUrl to on_publish http hook for issue #548 2016-01-08 15:10:25 +08:00
winlin
f516636448 refine code for hooks and http core. 2015-12-29 18:33:02 +08:00
winlin
d0c74fa7cd update 2015 to 2016 2015-12-23 11:35:40 +08:00
winlin
ffef3905af merge from srs2. 2015-12-11 11:35:56 +08:00
winlin
2830ee12c1 fix the on_hls.ts_url bug. 2015-12-11 11:29:10 +08:00
winlin
01c46bdbfd rename org simle-rtmp-server to ossrs 2015-11-11 10:45:45 +08:00
winlin
1ffd5fd455 rename org simple-rtmp-server to ossrs 2015-11-11 10:37:50 +08:00
winlin
f57e537686 for #515, merge from srs2, use SrsAutoFreeA. 2015-11-02 11:29:20 +08:00