311 commits

Author	SHA1	Message	Date
winlin	1b175b1107	for #730, support config in/out ack size. 3.0.13	2017-01-06 14:57:54 +08:00
winlin	4709d0214c	for #711, support prefile for transcode. 3.0.12	2017-01-06 10:39:37 +08:00
winlin	8bdf50b14d	update feature list	2017-01-05 09:29:12 +08:00
winlin	f2efa96015	for #324, always enable hstrs. 3.0.10	2017-01-05 09:08:56 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +08:00
winlin	2a01540433	support change work_dir for oryx.	2016-09-23 14:53:58 +08:00
winlin	eed4626c35	use larger limit	2016-03-10 12:28:46 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +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	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +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	8cec06e898	merge srs2, use srs_freepa for array	2015-11-02 11:05:39 +08:00
winlin	2af7749771	for #515, use srs_freepa to free the array.	2015-11-02 11:02:27 +08:00
winlin	cef1ae5a8e	fix the config bug.	2015-10-28 12:55:16 +08:00
winlin	f0e39cc330	support show the summary of kafka metadata.	2015-10-23 14:42:04 +08:00
winlin	8974fe298b	connect to kafka and send metadata request.	2015-10-23 14:42:03 +08:00
winlin	6efd2dd27e	add load balance round robin for brokers.	2015-09-24 17:20:04 +08:00
winlin	2a4ab8a923	add brokers to config	2015-09-24 14:53:22 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	b5ccc35340	add kafka config	2015-09-22 15:10:43 +08:00
winlin	df6ac8842c	rename rtmp utility to protocol utility	2015-09-22 09:11:07 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	225e742657	add args3	2015-09-17 14:03:25 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	087f7740b7	fix the build failed bug	2015-09-17 11:41:23 +08:00
winlin	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	2a1b2b69a0	for #459, dvr support apply filter for ng-control dvr module.	2015-09-15 15:58:57 +08:00
winlin	e8a00de4a3	for #319, support enable or disable vhost.	2015-09-15 12:51:14 +08:00
winlin	631e76cd32	for #319, support update and delete the disabled vhost	2015-09-15 12:15:18 +08:00