857 commits

Author	SHA1	Message	Date
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	439c67018d	remove unused macros.	2016-12-09 15:58:59 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00
winlin	dd1c769f65	refine main	2016-12-08 17:35:33 +08:00
winlin	28517849ed	refine typo	2016-12-07 12:09:39 +08:00
winlin	0a8d40925f	merge from 2.0	2016-11-09 09:44:19 +08:00
winlin	d8599a56ca	fix #654, crash when source cleanup for edge. 2.0.221	2016-11-05 10:48:49 +08:00
winlin	2f5f7d4a7b	merge srs2	2016-10-26 09:55:24 +08:00
winlin	8b00e56a84	fix #666, crash when source cleanup for http-flv. 2.0.220	2016-10-26 09:54:49 +08:00
winlin	112d98ffdb	merge srs2.	2016-10-10 11:56:10 +08:00
winlin	d6fc289c6a	fix #661, close fd after thread stopped. 2.0.219	2016-10-10 11:54:08 +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	e15e07c4d1	merge srs2	2016-09-15 13:39:25 +08:00
winlin	ff3f8272a9	fix #640, typo for rtmp type. 2.0.217	2016-09-15 13:37:11 +08:00
winlin	504352d17a	merge srs2.	2016-09-12 18:21:44 +08:00
winlin	c2cb666995	fix fast stream error bug. 2.0.216	2016-09-12 18:21:14 +08:00
winlin	8a4e241eec	merge from srs2	2016-09-09 14:29:33 +08:00
winlin	6c4c68ccb6	2.0 beta1(2.0.215) released.	2016-09-09 14:26:16 +08:00
winlin	0e9318e5d8	merge from 2.0	2016-09-05 14:16:24 +08:00
winlin	c7b97aa1c3	fix memory leak at source. 2.0.214	2016-09-05 14:13:37 +08:00
winlin	815f2491a4	merge from 2.0	2016-09-05 09:39:20 +08:00
winlin	6ec60b0a21	fix memory leak at handshake. 2.0.213	2016-09-05 09:38:30 +08:00
winlin	39a46f7b97	Merge branch '2.0release' into develop	2016-09-03 23:11:58 +08:00
winlin	1214af643e	refine comments for arm	2016-09-03 23:11:51 +08:00
winlin	c0498c82ee	merge 2.0	2016-09-03 18:48:19 +08:00
winlin	e775eb3ff2	support all arm for patched st. 2.0.212	2016-09-03 18:47:46 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	abeb4f46a9	merge 2.0	2016-08-06 17:28:43 +08:00
winlin	ec6e77992e	2.0.210	2016-08-06 16:38:18 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +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	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	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +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	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00