62 commits

Author	SHA1	Message	Date
winlin	c6817cc422	for #354, remove the double underscore of macro.	2015-03-21 10:25:03 +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	025b707330	refine the http request reader.	2015-03-04 18:20:15 +08:00
winlin	04dc60ebe1	refine http for srs, rename SrsGoHttp to SrsHttp.	2015-03-04 13:09:35 +08:00
winlin	fb3fced8d0	for #179, revert dvr http api. 2.0.128.	2015-03-01 17:57:28 +08:00
winlin	b903a7b436	for #179, dvr suport vhost/app/stream level control. 2.0.125.	2015-02-25 09:20:11 +08:00
winlin	a3648063d5	fix #179, support dvr http api. 2.0.123.	2015-02-24 17:29:30 +08:00
winlin	1246989ea9	for #179, refine dvr, support callback when reap dvr segment.	2015-02-22 10:45:13 +08:00
winlin	849e59b05d	for #179, support http api to start dvr.	2015-02-21 23:09:21 +08:00
winlin	c67a4fdf97	for #179, enable http api crossdomain for dvr api.	2015-02-21 21:17:59 +08:00
winlin	95b4baee7c	for #179, refine dvr code to more simple.	2015-02-21 16:25:04 +08:00
winlin	a4ba40952a	for #250, rename rtmp to protocol dir.	2015-01-23 10:07:20 +08:00
winlin	cbed2bbca4	fix #277, refine http server refer to go http-framework. 2.0.98	2015-01-17 23:00:40 +08:00
winlin	9bbbaad288	for bug #277, refine http api refer to go http-framework. 2.0.97	2015-01-17 21:58:23 +08:00
qiang.li	08e9f6ef42	add play client num in statistic	2015-01-06 22:20:31 +08:00
winlin	f1efdcd000	refine code, use global virtual id to generate the id of vhost and stream.	2015-01-05 13:08:11 +08:00
winlin	97bea51499	refine the api, response the error code and data.	2015-01-05 12:49:00 +08:00
winlin	cc796a433a	refine the statistic arch.	2015-01-05 12:40:38 +08:00
winlin	40ed2249e8	refine code to use the one coding style.	2015-01-05 12:20:46 +08:00
qiang.li	a4a93613d0	add statistic for stream	2015-01-04 22:47:12 +08:00
qiang.li	8d534d3470	get stream info use http api #227	2015-01-03 12:57:13 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00
winlin	bc6616bd1f	refine code according to inspect of clion. 0.9.219	2014-09-28 11:08:30 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	6ee9ea341a	refine code, rename SrsSocket to SrsStSocket	2014-07-26 20:08:37 +08:00
winlin	b19d2e8e2d	refine code, rename srs_app_socket.cpp to srs_app_st_socket.cpp	2014-07-26 20:07:12 +08:00
winlin	8497b22d4a	complete the consts refine	2014-07-20 13:45:54 +08:00
winlin	c46b3bd193	refie http consts.	2014-07-20 13:37:30 +08:00
winlin	95e73d0be1	remove the config log http api. 0.9.148	2014-07-05 13:02:50 +08:00
winlin	f173345e15	support report summaries in heartbeat. 0.9.132	2014-06-23 15:44:49 +08:00
winlin	094d82bd06	add connections count to api summaries. 0.9.127	2014-06-19 18:49:05 +08:00
winlin	6ee2ba049b	add srs bytes and kbps to api summaries. 0.9.126	2014-06-19 15:28:05 +08:00
winlin	b0e4dc8085	refine network bytes of summaries, remove the lo data.	2014-06-18 16:21:33 +08:00
winlin	d0b08d0d51	add network bytes to api summaries. 0.9.125	2014-06-18 16:13:02 +08:00
winlin	7166b666c8	refine http log.	2014-05-30 09:20:51 +08:00
winlin	7920348e5f	extract get_local_ip and get_peer_ip to app utility	2014-05-27 16:45:02 +08:00
winlin	0186247fee	support http api json, to PUT/POST. 0.9.105	2014-05-18 17:57:20 +08:00
winlin	3064e5ec61	fix bug of nx_json parse, to 0.9.104	2014-05-18 16:48:24 +08:00
winlin	d6355efe22	support http api json, to PUT/POST, to 0.9.103	2014-05-18 16:15:35 +08:00
winlin	2f89c8b2e8	move some utilities from kernel to app. 0.9.99	2014-05-17 14:53:04 +08:00
winlin	dc66c525fd	refine autofree, only free object, never free arrays	2014-05-14 09:41:41 +08:00
winlin	900406cc70	refine api, now to now_ms	2014-05-08 16:13:33 +08:00
winlin	a1fed15789	add uptime, startup time, load to api	2014-05-08 15:45:51 +08:00
winlin	a5f4f6bd14	add meminfo	2014-04-20 00:15:26 +08:00
winlin	15aea4d9b3	add cpuinfo	2014-04-19 23:18:00 +08:00
winlin	951a93ab86	get self proc and system proc stat	2014-04-19 21:43:13 +08:00
winlin	117fd67950	add cpu stat	2014-04-19 21:23:34 +08:00
winlin	23a1b29935	add dvr option. refine macros of auto headers	2014-04-15 14:01:57 +08:00
winlin	4984631cd6	refine the http crossdomain, send it only required	2014-04-03 16:39:55 +08:00