3322 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
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
winlin	5e48dab2b9	Merge branch '2.0release' into develop	2015-08-23 09:57:07 +08:00
winlin	21b175b4db	add remote console to feature list.	2015-08-23 09:57:04 +08:00
winlin	ce1627eb34	Merge branch '2.0release' into develop	2015-08-23 09:55:46 +08:00
winlin	899ecb5661	add remote console to feature list.	2015-08-23 09:55:41 +08:00
winlin	8d2b2d0148	Merge branch '2.0release' into develop	2015-08-23 09:39:23 +08:00
winlin	ada33bdad7	add srs 1.0release time	2015-08-23 09:39:16 +08:00
winlin	b4040a5fc9	Merge branch '2.0release' into develop	2015-08-23 09:11:38 +08:00
winlin	724498bb09	update 2.0 release file to srs2.0a0	2015-08-23 09:11:32 +08:00
winlin	7e475e15b0	release 2.0a0	2015-08-23 09:00:57 +08:00
winlin	28791fd14a	release 2.0alpha0, the 2.0a0, 2.0.185	2015-08-23 09:00:21 +08:00
winlin	5721bc371c	Merge branch '2.0release' into develop	2015-08-23 00:01:11 +08:00
winlin	e43d4e46b4	support JSONP DELTE/POST/PUT	2015-08-23 00:01:03 +08:00
winlin	baa70d4ddd	add nb_streams for vhost	2015-08-22 22:51:59 +08:00
winlin	7a2836ae2a	Merge branch '2.0release' into develop	2015-08-22 19:49:39 +08:00
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	2015-08-22 18:18:18 +08:00
winlin	22485ce5e9	Merge branch '2.0release' into develop	2015-08-22 13:57:45 +08:00
winlin	aeebddb269	for #442, add more information for client for api.	2015-08-22 13:57:34 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +08:00
winlin	b37797b13a	for #442, add publish connection in stream.publish api	2015-08-22 13:03:10 +08:00
winlin	529803ed04	refine code for api.	2015-08-22 12:38:14 +08:00
winlin	1962449770	Merge branch '2.0release' into develop	2015-08-22 11:09:11 +08:00
winlin	6b6d951298	add api /api/v1/features	2015-08-22 11:08:56 +08:00
winlin	4763f205a2	add kbps for vhost and stream	2015-08-22 09:49:38 +08:00
winlin	0a4d78383c	Merge branch '2.0release' into develop	2015-08-21 17:15:42 +08:00