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
8519 commits 14 branches 107 tags 377 MiB
Commit graph

93 commits

Author SHA1 Message Date
panda
1e43bb6b9f Fix command injection in api-server for HTTP callback. v5.0.157, v6.0.48 2023-06-05 16:41:19 +08:00
panda
9600e495c7 Rewrite research/api-server code by Go, remove Python. (#3382) 
* support api-server golang

* Update release to v6.0.18 and v5.0.137

PICK 81566868bf

Co-authored-by: winlin <winlin@vip.126.com>
Co-authored-by: chundonglinlin <chundonglinlin@163.com>
Co-authored-by: ChenGH <chengh_math@126.com>
 2023-01-18 13:14:26 +08:00
winlin
18d25eacfb Merge 4.0release 2022-08-24 19:26:47 +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
93aa0eb5ba Squash: Fix bugs 2022-01-13 18:26:28 +08:00
winlin
73d0ce1cee Support api to specify the WebRTC API port. v4.0.225 2022-01-13 13:34:06 +08:00
winlin
db3ceb445b Support api_port to specify the WebRTC API port. v4.0.224 2022-01-13 12:07:34 +08:00
winlin
d47dd81f46 Refine the running homepage. v4.0.221 2022-01-13 11:10:11 +08:00
winlin
fb93631407 Refine the running homepage. v4.0.221 2022-01-13 11:00:11 +08:00
winlin
574afb4320 Refine the running homepage. v4.0.221 2022-01-13 10:44:10 +08:00
winlin
7e25d0d7f4 Refine the running homepage. v4.0.221 2022-01-12 22:03:46 +08:00
winlin
7d3ec991e1 Squash: Merge SRS 4.0 2021-09-26 17:12:55 +08:00
winlin
81fa762b4f Update the SRS logo 2021-09-25 10:21:24 +08:00
winlin
13d015b8fd Squash: Fix random bug 2021-07-04 16:04:51 +08:00
winlin
642359a50e For #2424, use srandom/random to generate. 4.0.139 2021-07-04 15:50:29 +08:00
winlin
15901cacee SquashSRS4: Use SPDX-License-Identifier: MIT. 5.0.3 2021-05-31 13:42:20 +08:00
winlin
3cd22b6e6e Use SPDX-License-Identifier: MIT. 4.0.124 2021-05-31 12:59:21 +08:00
winlin
f043a7eb48 SquashSRS4: Allow RTC play before publish. 2021-05-19 21:06:17 +08:00
winlin
ef617b5fc6 Demo: Refine H5 demo page 2021-05-19 20:54:22 +08:00
winlin
3d74b0efc9 SquashSRS4: Add crossdomain.xml for install script. 2021-04-26 13:59:29 +08:00
winlin
db37a4ac02 SquashSRS3: Add crossdomain.xml for install script. 2021-04-26 13:57:14 +08:00
winlin
d4a8a72388 SquashSRS4: Add console. Disable cherrypy by default. 2021-04-24 19:45:05 +08:00
winlin
de1c7522f0 SquashSRS3: Add console 2021-04-24 19:07:37 +08:00
winlin
31945c244d For #1110, Refine code. 2018-08-05 11:09:48 +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
00c60db7c3 Merge branch '2.0release' into develop 2016-01-31 22:47:48 +08:00
winlin
f7d9ed5ae4 update api 2016-01-31 21:49:53 +08:00
winlin
49308dddfb update 2015 to 2016 2015-12-23 11:41:41 +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
7db7d43aea Merge branch '2.0release' into develop 2015-11-09 15:25:55 +08:00
winlin
18b50d961f support query server by id. 2015-11-09 15:19:50 +08:00
winlin
aca9fe805c Merge branch '2.0release' into develop 2015-11-09 14:51:47 +08:00
winlin
d916c53702 refine the api server. 2015-11-09 14:51:41 +08:00
winlin
2bae6e09d3 for #502, snapshot 1 image per 1 seconds, choose best from 5 images. 2015-10-20 14:10:14 +08:00
winlin
1aa4502d5f for snapshot, choose the best to link to the [stream]-best.png 2015-10-20 13:38:03 +08:00
winlin
33a282e576 support snapshot by http hooks for #152. 2015-10-20 12:30:57 +08:00
winlin
7cdcf41d26 refine the api server 2015-09-23 18:23:09 +08:00
winlin
31d2de3f23 fix #435, add pageUrl for HTTP callback on_play. 2015-07-21 10:50:57 +08:00
winlin
b23e196f20 migarate from winlinvip to srs org, move the copyright to srs org. 2015-04-29 17:38:23 +08:00
winlin
115daa3cc1 migarate from winlinvip to srs org 2015-04-29 17:06:32 +08:00
winlin
0000c945ea refine the proxy api server. 2015-04-10 16:07:45 +08:00
winlin
fe1886aa08 add proxy for hls 2015-04-10 15:50:12 +08:00
winlin
e3c6e52547 enhanced on_hls_notify, support HTTP GET when reap ts. 2015-04-10 12:01:45 +08:00
winlin
64b065e450 for hls callback, add duration of ts. 2015-04-03 13:46:44 +08:00
winlin
c49bc0628e support on_hls for http hooks. 2.0.152. 2015-03-31 17:42:12 +08:00
winlin
97442c56b6 enhance hls in floor mode. 2015-03-31 17:03:14 +08:00
winlin
76c1957260 enhance hls, increase piece one by one. 2015-03-31 16:58:20 +08:00
winlin
1246989ea9 for #179, refine dvr, support callback when reap dvr segment. 2015-02-22 10:45:13 +08:00
winlin
dc11418c79 fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89 2015-01-03 15:33:23 +08:00