187 commits

Author	SHA1	Message	Date
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	b231550c32	fix #717, #691, http api/static/stream support cors. 3.0.9	2016-12-15 16:22:04 +08:00
winlin	f6661989af	fix typo for #513, #691	2016-12-15 15:00:08 +08:00
winlin	f30b3073a2	refine the cros of api for flv	2016-12-15 14:10:02 +08:00
winlin	439c67018d	remove unused macros.	2016-12-09 15:58:59 +08:00
winlin	61c0c168b9	merge from srs2.	2016-01-13 12:52:19 +08:00
winlin	266397acee	merge from srs2	2016-01-13 12:46:23 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +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	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
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	65b2ed7ac5	refine code, move the order of functions.	2015-08-03 14:11:21 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	d103557a8b	merge the rtmp sdk to stack.	2015-06-13 16:04:59 +08:00
winlin	d7e5df2578	cleanup connections when terminate server.	2015-06-08 14:03:16 +08:00
winlin	f0ae66a081	merge the app http to conn.	2015-05-22 22:34:03 +08:00
winlin	ce1bb6c605	refine code, extrat the ISrsHttpMessage.	2015-05-22 22:24:05 +08:00
winlin	e2955da78f	refine code, extract the http protocol sdk to module.	2015-05-22 20:47:27 +08:00
winlin	c17a1198cb	fix #399, disconnect when not keep alive.	2015-05-22 16:27:48 +08:00
winlin	46a81372e7	fix #398, set recv timeout for http connection.	2015-05-22 13:57:04 +08:00
winlin	cba6675560	refine the http message, set the connection if required.	2015-05-04 19:06:38 +08:00
winlin	022b6aa561	refine the http remux for http flv stream.	2015-05-03 23:34:59 +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	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