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

3346 commits

Author SHA1 Message Date
winlin
bc100c2867 refine the log, move default to each functions. 2015-08-29 19:46:56 +08:00
winlin
7ef3ff90c0 refine the config structure, compatible with SRS1/2 2015-08-29 18:40:18 +08:00
winlin
a79e19599c for #319, support query the vhost info. 2015-08-29 16:12:30 +08:00
winlin
bdfd0ae09e for #319, dumps the http static, remux and globals. 2015-08-28 23:51:23 +08:00
winlin
5efd1912f2 refine readme 2015-08-28 22:21:18 +08:00
winlin
871ac95c2e merge from srs 2 2015-08-28 18:49:41 +08:00
winlin
0221434ae9 refine links 2015-08-28 18:48:35 +08:00
winlin
166e487d24 refine links 2015-08-28 18:47:39 +08:00
winlin
f3b4f2bc53 refine readme for links 2015-08-28 18:29:46 +08:00
winlin
7f2bbcb248 refine readme links. 2015-08-28 18:26:25 +08:00
winlin
c290951d20 merge from srs2 2015-08-28 18:18:49 +08:00
winlin
cf48559752 refine the readme. 2015-08-28 18:17:56 +08:00
winlin
1b1a2a1e63 fix #471, api response the width and height. 3.0.2 2015-08-28 18:00:24 +08:00
winlin
04bea781ca use amf0 encode for json encode. 2015-08-28 15:11:11 +08:00
winlin
e0219bd7aa refine code, merge json encode to amf0. 2015-08-28 14:39:29 +08:00
winlin
66ffcad635 for #319, always allow raw query. 2015-08-28 13:17:46 +08:00
winlin
f167616379 rename the config_query to query 2015-08-28 13:01:04 +08:00
winlin
75ca759e5d fix the reload http api bug. 2015-08-28 12:38:09 +08:00
winlin
2dcf3bc606 for #319, support rpc raw api to query the HTTP RAW API configs. 2015-08-28 12:28:18 +08:00
winlin
af0a76e51a fix the build failed bug on centos 2015-08-28 00:03:10 +08:00
winlin
e03d8a0115 fix the build failed bug on centos 2015-08-28 00:01:19 +08:00
winlin
555a3fbf5f for #319, support render HTTP RAW API in console. 2015-08-27 23:55:59 +08:00
winlin
8e635d9749 for #319, support HTTP RAW API config_query global data. 2015-08-27 22:46:56 +08:00
winlin
d921d59e57 for #319, support HTTP RAW API reload. 2015-08-27 18:11:50 +08:00
winlin
f74dc62046 fix the process restart bug. 2015-08-26 23:20:19 +08:00
winlin
e39e006d63 fix the exec clear bug. 2015-08-26 23:11:42 +08:00
winlin
c081a5370b Merge branch '2.0release' into develop 2015-08-26 23:03:01 +08:00
winlin
fe4cdceb15 always wait for process to terminated when SIGKILL. 2015-08-26 23:02:54 +08:00
winlin
1e0481a2d0 for #319, support signal to persistence config 2015-08-26 21:49:05 +08:00
winlin
980e3921e4 for #319, add signal to write config to file. 2015-08-26 21:11:28 +08:00
winlin
cdde293785 add todo for reload the source components. 2015-08-25 22:59:17 +08:00
winlin
53f4ce3604 for #367, update wiki to v3 2015-08-25 22:41:57 +08:00
winlin
c34b0c86e1 fix #367, support nginx-rtmp exec. 3.0.1 2015-08-25 22:29:00 +08:00
winlin
7de181004f Merge branch '2.0release' into develop 2015-08-25 11:55:44 +08:00
lovecat
9c2beffe8f statistic connection bytes before remove client. 2015-08-25 11:46:12 +08:00
winlin
039af7243c for #367, refine the comments for process. 2015-08-24 22:26:19 +08:00
winlin
6fe88d088c for #367, process support redirect stdout and stderr. 2015-08-24 22:19:57 +08:00
winlin
0e1861b084 for #367: extract the process from ffmpeg to exec programs. 2015-08-24 21:51:05 +08:00
winlin
3a8c03a471 Merge branch '2.0release' into develop 2015-08-24 16:00:41 +08:00
winlin
a242aa35dc add pid to srs rtmp dump 2015-08-24 16:00:11 +08:00
winlin
15102a7345 refine commit script 2015-08-24 11:16:39 +08:00
winlin
2a4b448cce Merge branch '2.0release' into develop 2015-08-24 11:04:48 +08:00
winlin
a7f4104d45 fix bug of commit script 2015-08-24 11:04:39 +08:00
winlin
d8030faabe Merge branch '2.0release' into develop 2015-08-24 10:59:39 +08:00
winlin
064031cac1 refine commit script 2015-08-24 10:59:32 +08:00
winlin
8e259eb0c2 refine the commit script 2015-08-24 10:57:12 +08:00
winlin
4118138cf0 update commit script 2015-08-24 10:54:31 +08:00
winlin
b25c45c643 refine srs player, support set the bufferTimeMax. 2015-08-24 07:55:30 +08:00
winlin
74d4c96423 for #367, design the config for exec. 2015-08-23 21:58:06 +08:00
winlin
cbfe438e73 for #367, design the config for exec. 2015-08-23 21:53:20 +08:00