213 commits

Author	SHA1	Message	Date
winlin	9802dc326e	For #913, source support complex error	2017-09-23 22:12:33 +08:00
winlin	fd91df9411	For #913, reload use complex error	2017-09-22 16:14:30 +08:00
winlin	661eb8b37c	For #913, use complex error for reload utc time	2017-07-29 20:02:38 +08:00
winlin	5c9a12e72a	For #913, use complex error for listener	2017-07-29 12:45:17 +08:00
winlin	71dd3f3137	For #913, use complex error for server handler.	2017-07-18 20:24:07 +08:00
winlin	9db2a04c3b	For #913, coroutine support complex error.	2017-06-11 18:44:20 +08:00
winlin	860aac3e50	For #913, config reload and persistence	2017-06-11 09:54:09 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	a20e2c3ef6	For #913, refine server utility	2017-06-10 15:20:48 +08:00
winlin	ca9f0bdb1e	For #913, refine server initialize st	2017-06-10 14:29:41 +08:00
winlin	4e4091231e	Refine object create in server.	2017-06-10 14:19:10 +08:00
winlin	93710c7489	For #913, refine the error mechanism	2017-06-09 13:29:23 +08:00
winlin	bb200b5d2d	For #913, add complex error.	2017-06-09 11:50:35 +08:00
winlin	9ca36970aa	Fix #908, use empty coroutine to avoid NULL pointer.	2017-06-04 19:13:56 +08:00
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	2017-05-30 09:05:02 +08:00
winlin	3ffb0980f5	For #906, #902, use connection manager to remove connection	2017-05-29 18:34:41 +08:00
winlin	44f542f77f	For #906, #902, replace the endless thread with coroutine	2017-05-29 17:56:26 +08:00
winlin	f97260be1d	Merge SRS2	2017-05-01 16:44:14 +08:00
walkermi	79e4f9f3a0	fixed compile error when add --log-info (#860) ... * Update srs_app_server.cpp fixed compile error when add --log-info * Update srs_app_mpegts_udp.cpp fixed compile error when add --log-info	2017-04-30 12:29:37 +08:00
winlin	e3526c0cf6	For #820, modules use service only.	2017-03-26 13:40:39 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	2980e7d3ef	For #813, refine code.	2017-03-25 12:52:54 +08:00
Chengdong Zhang	8ad934a8a4	srs_info use not available variable (#813) ... srs_info use not available variable. Variable has been removed or changed.	2017-03-24 23:42:37 -05:00
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
winlin	3fe338d1c5	for #742, use ms for application clock tbn.	2017-01-17 12:25:30 +08:00
winlin	7ac932cfa0	update to 2013-2017	2016-12-16 11:57:25 +08:00
winlin	664844b5f5	merge from srs2. for #513.	2016-12-15 14:54:09 +08:00
winlin	759c84a395	for #513, remove hls ram from srs2 to srs3+. 2.0.224	2016-12-15 14:48:38 +08:00
winlin	2955b1fd2d	support log rotate signal SIGUSR1. 3.0.8	2016-12-08 18:23:22 +08:00
winlin	2d387035cd	refine the global variables.	2016-12-08 17:26:04 +08:00
winlin	9a3674c624	refine kafka	2016-12-08 11:44:49 +08:00
winlin	f6c8e02cca	Merge branch '2.0release' into develop	2016-11-24 18:12:31 +08:00
ME_Kun_Han	ec4d1b3b4f	fix bug: run srs at startup failed. (#454)	2016-11-24 18:05:43 +08:00
winlin	0e308b0fa1	merge srs2, support oryx	2016-09-23 15:33:43 +08:00
winlin	07fe35f11d	support asprocess for oryx. 2.0.218	2016-09-23 15:17:46 +08:00
winlin	b748fac23a	support asprocess for oryx. 2.0.218	2016-09-23 15:00:50 +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	8db25a0bf5	fix the log for mmap.	2016-01-21 16:18:42 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	1e4c8f8bf3	fast stop server.	2015-12-11 10:30:13 +08:00
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +08:00
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +08:00
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	2015-11-11 10:45:45 +08:00