153 commits

Author	SHA1	Message	Date
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	1ffd5fd455	rename org simple-rtmp-server to ossrs	2015-11-11 10:37:50 +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
winlin	8b3bd5b4b9	add srs memory watcher.	2015-06-07 15:13:41 +08:00
winlin	811ef4bcf6	dispose the gop cache	2015-06-07 09:27:47 +08:00
winlin	26b76c0e4c	fix #420, remove ts for hls ram mode.	2015-06-05 20:38:01 +08:00
winlin	d611bb6b45	for #209, server cycle to enable the hls to cleanup. do dispose	2015-05-30 10:48:02 +08:00
winlin	567d84e997	fix #374: when terminate srs, cleanup to ensure FFMPEG quit.	2015-05-30 09:58:17 +08:00
winlin	394e070b2e	support dolphin	2015-05-28 14:59:12 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +08:00
winlin	1150cde829	fix the verbose build failed.	2015-05-27 11:12:52 +08:00
winlin	fec8422d6b	fix bug of configure.	2015-05-27 10:23:40 +08:00
winlin	2e1ca3c751	fix the build failed bug.	2015-05-25 08:17:11 +08:00
winlin	f510a3d6fb	add /api/v1/versions for http server for go-sharp to detect.	2015-05-24 13:01:23 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +08:00
winlin	5d7b0edccc	merge from bravo code, fix some warnings.	2015-05-22 11:20:25 +08:00
winlin	44bc7976ac	merge from bravo system, add the rtmfp to bms(commercial srs). 2.0.163.	2015-05-19 18:06:20 +08:00
winlin	ea1e015a4e	fix the http read chunked encoding bug.	2015-05-04 18:11:52 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +08:00
winlin	f0c24eeacc	add stream caster for post flv over http.	2015-05-03 10:56:20 +08:00
winlin	b23e196f20	migarate from winlinvip to srs org, move the copyright to srs org.	2015-04-29 17:38:23 +08:00
winlin	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
winlin	eb54ec25c9	fix compile errors.	2015-04-03 11:30:59 +08:00
winlin	717d088376	support server cycle handler. 2.0.153.	2015-03-31 18:06:55 +08:00
winlin	b6feb0742f	fix #149, RTMP/HTTP support bind to <[ip:]port>. 2.0.148	2015-03-23 23:13:57 +08:00
winlin	33cca3e027	for #155, add todo for osx. 2.0.146	2015-03-21 15:22:45 +08:00
winlin	bbac2348db	for #354, remove the double underscore functions and variables.	2015-03-21 11:55:28 +08:00
winlin	f564c903ac	support got uptime and loadavg for osx. 2.0.145	2015-03-18 22:30:17 +08:00
winlin	cf3becbc17	for #155, osx(darwin) enable http api and stat, rusage is ok.	2015-03-17 22:35:47 +08:00
winlin	27cb62b7aa	for #324, support hstrs(http stream trigger rtmp source) origin mode. 2.0.139.	2015-03-14 19:45:13 +08:00
winlin	6d15d0ea99	for #324, refine code, add hstrs config.	2015-03-14 09:52:47 +08:00
winlin	5143e3a58d	fix #316, http api provides stream/vhost/srs/server bytes, codec and count. 2.0.136	2015-03-08 19:59:10 +08:00
winlin	8bf60895a9	refine the kbps of server.	2015-03-08 12:55:40 +08:00