183 commits

Author	SHA1	Message	Date
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
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +08:00
winlin	9ebb77d711	fix the warnings	2015-10-28 11:58:49 +08:00
winlin	61486a82aa	kafka use topic and partition cache	2015-10-23 14:42:04 +08:00
winlin	7013993c7a	kafka send the accept message.	2015-10-23 14:42:04 +08:00
winlin	9ead08725d	use kernel utility int2str and float2str	2015-09-24 17:54:58 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	afd6428366	refine code of server.	2015-09-23 17:21:57 +08:00
winlin	9a9483e7d5	support without kafka	2015-09-22 17:46:07 +08:00
winlin	abb5c5ad31	add kafka producer	2015-09-22 17:40:05 +08:00
winlin	0e52fc6d5b	rename SrsStream to SrsBuffer	2015-09-22 08:57:31 +08:00
winlin	364460f2ab	for #319, support raw update global.listen	2015-08-30 23:18:14 +08:00
winlin	d921d59e57	for #319, support HTTP RAW API reload.	2015-08-27 18:11:50 +08:00
winlin	980e3921e4	for #319, add signal to write config to file.	2015-08-26 21:11:28 +08:00
lovecat	9c2beffe8f	statistic connection bytes before remove client.	2015-08-25 11:46:12 +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	a7589b9ad3	refine code for api, add clients and parse_rest_id	2015-08-21 16:12:48 +08:00
winlin	1261916eab	refine the mount and dir to /console	2015-08-12 12:49:22 +08:00
winlin	f28c9b7eb5	merge from 2.0release	2015-08-11 15:49:48 +08:00
lovacat	e8c0ca7af0	fix #442: HTTP API kickoff client.	2015-08-11 15:23:46 +08:00
winlin	d761ebfa55	refine the api, move the requests and errors to rest.	2015-08-11 13:09:21 +08:00
winlin	c5bf397295	fix the http error header.	2015-08-10 16:41:25 +08:00
winlin	31d2de3f23	fix #435, add pageUrl for HTTP callback on_play.	2015-07-21 10:50:57 +08:00
winlin	b3b6df365e	fix the stream caster build failed bug.	2015-07-10 13:50:35 +08:00
winlin	3211282b0c	refine the http code.	2015-06-14 19:42:43 +08:00
winlin	f8f6e438cc	extract http static and http stream from http conn.	2015-06-14 14:06:39 +08:00
winlin	0d66e92ab5	refine code, support configure to enable --memory-watch	2015-06-13 15:45:25 +08:00
winlin	66837ffa6e	fix the thread stop bug, must wait when not joinable.	2015-06-09 11:47:04 +08:00
winlin	d317528af9	refine the signal manager.	2015-06-09 11:19:28 +08:00
winlin	d7e5df2578	cleanup connections when terminate server.	2015-06-08 14:03:16 +08:00