127 commits

Author	SHA1	Message	Date
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	2015-12-15 12:46:47 +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	6587c5b2f1	merge from srs2	2015-10-01 13:22:51 +08:00
winlin	7811b4f3f7	fix #497, response error when client not found to kickoff. 2.0.194	2015-10-01 13:20:13 +08:00
winlin	168625dce2	rename rtmp amf0 to protocol amf0.	2015-09-22 09:05:21 +08:00
winlin	b471c6e61c	refine code, use json integter rather than number.	2015-09-19 14:40:32 +08:00
winlin	3042115385	refine json to_str to dumps.	2015-09-19 13:37:56 +08:00
winlin	b59d9ba6a1	support amf0 and json to convert with each other.	2015-09-19 13:31:57 +08:00
winlin	3f7e69b617	json objects support dumps to string.	2015-09-19 12:27:31 +08:00
winlin	256459e1ec	fix the utest bug	2015-09-17 11:37:35 +08:00
winlin	8a90e76637	fix #459, support dvr raw api. 3.0.4	2015-09-15 23:00:00 +08:00
winlin	8f9cfcdcf4	fix #319, http raw api support update global and vhost. 3.0.4	2015-09-15 13:03:18 +08:00
winlin	e8a00de4a3	for #319, support enable or disable vhost.	2015-09-15 12:51:14 +08:00
winlin	631e76cd32	for #319, support update and delete the disabled vhost	2015-09-15 12:15:18 +08:00
winlin	01308ecc98	for #319, support initialize the parser to whether use jsonp	2015-09-12 22:22:33 +08:00
winlin	491ec11833	for #319, raw api support add new vhost	2015-09-12 21:55:53 +08:00
winlin	c4feb8f6ed	for #319, raw api support update all globals.	2015-09-09 23:32:02 +08:00
winlin	6aafd072db	for #319, raw api support update srs log tank, level and file.	2015-09-09 22:44:34 +08:00
winlin	8107e5f9a6	for #319, raw api support set the ff_log_dir	2015-09-09 21:46:29 +08:00
winlin	c8466c36bd	for #319, raw api support update the global RTMP chunk_size.	2015-09-01 21:27:04 +08:00
winlin	310b5a14cb	for #319, support minimal query api	2015-09-01 13:33:49 +08:00
winlin	06c7ae62ee	for #319, refine the error code for RAW APi.	2015-09-01 12:27:53 +08:00
winlin	11c409688b	for #319, http raw api support query. 3.0.3	2015-08-31 23:34:03 +08:00
winlin	8a2709dd2c	for #319, do not apply when config not changed.	2015-08-31 12:06:22 +08:00
winlin	a62c82bd46	for #319, api raw update global.listen	2015-08-30 23:42:21 +08:00
winlin	364460f2ab	for #319, support raw update global.listen	2015-08-30 23:18:14 +08:00
winlin	f8d8c3ace4	use function to dumps the engine.	2015-08-30 23:08:27 +08:00
winlin	bdfd0ae09e	for #319, dumps the http static, remux and globals.	2015-08-28 23:51:23 +08:00
winlin	1b1a2a1e63	fix #471, api response the width and height. 3.0.2	2015-08-28 18:00:24 +08:00
winlin	04bea781ca	use amf0 encode for json encode.	2015-08-28 15:11:11 +08:00
winlin	e0219bd7aa	refine code, merge json encode to amf0.	2015-08-28 14:39:29 +08:00
winlin	66ffcad635	for #319, always allow raw query.	2015-08-28 13:17:46 +08:00
winlin	f167616379	rename the config_query to query	2015-08-28 13:01:04 +08:00
winlin	2dcf3bc606	for #319, support rpc raw api to query the HTTP RAW API configs.	2015-08-28 12:28:18 +08:00
winlin	e03d8a0115	fix the build failed bug on centos	2015-08-28 00:01:19 +08:00
winlin	8e635d9749	for #319, support HTTP RAW API config_query global data.	2015-08-27 22:46:56 +08:00
winlin	d921d59e57	for #319, support HTTP RAW API reload.	2015-08-27 18:11:50 +08:00
winlin	e43d4e46b4	support JSONP DELTE/POST/PUT	2015-08-23 00:01:03 +08:00
winlin	6e5143449e	HTTP API support JSONP by specifies the query string callback=xxx.	2015-08-22 18:18:18 +08:00
winlin	94641c812b	fix #442, support kickoff client.	2015-08-22 13:36:15 +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	20a8818a8e	refine the error response.	2015-08-21 17:15:32 +08:00
winlin	2edcf1d4ff	support query specified vhost	2015-08-21 17:00:52 +08:00
winlin	66a26bdce8	move json from app to protocol	2015-08-21 16:20:19 +08:00
winlin	a7589b9ad3	refine code for api, add clients and parse_rest_id	2015-08-21 16:12:48 +08:00
winlin	ab4620870d	refine the stat api, support query specified stream.	2015-08-21 15:51:20 +08:00
winlin	f28c9b7eb5	merge from 2.0release	2015-08-11 15:49:48 +08:00