156 commits

Author	SHA1	Message	Date
winlin	469250f850	For #464, support origin cluster api	2018-02-15 20:55:34 +08:00
winlin	ca1395a807	Change date from 2017 to 2018	2018-01-07 10:58:53 +08:00
winlin	6eae93258a	For #913, APP support complex error.	2018-01-01 19:39:57 +08:00
winlin	fd91df9411	For #913, reload use complex error	2017-09-22 16:14:30 +08:00
winlin	9f5224c34a	For #913, use complex error for http	2017-07-29 21:39:57 +08:00
winlin	661eb8b37c	For #913, use complex error for reload utc time	2017-07-29 20:02:38 +08:00
winlin	5c9a12e72a	For #913, use complex error for listener	2017-07-29 12:45:17 +08:00
winlin	1bf99e8f3e	For #907, Wrap ST, only use in service ST.	2017-05-30 09:05:02 +08:00
winlin	2ed2513f08	For #906, #902, use coroutine for one cycle thread	2017-05-29 19:45:19 +08:00
HungMingWu	815d50f00a	Remove warning: C++11 requires a space between string literal and macro (#874) ... On Ubuntu 17.04, the default gcc compiler version is 6.3.0. It switch standard from c++98 to c++11. So it would generate verbose warnings.	2017-05-06 14:05:22 +08:00
winlin	0a57a46016	Refine LICENSE	2017-03-25 21:29:29 +08:00
winlin	f32aab3d92	For #299, refine code.	2017-03-25 17:21:39 +08:00
winlin	308c6fee18	Fix #786, simply don't reuse object. 3.0.20	2017-03-02 16:43:06 +08:00
winlin	7fd221ef63	Always enable DVR	2017-02-11 17:27:40 +08:00
winlin	8e5d4dc73d	always enable http and hls	2017-02-11 13:29:53 +08:00
winlin	ac7ee10b60	fix #751,#756, refine code	2017-02-03 11:56:02 +08:00
Chengdong Zhang	80540e4dc1	change TAB space ... change TAB space for line 794	2017-02-03 10:58:32 +08:00
eagle-zhang	7b02e3543f	Clients Api support start and count ... Clients Api support start and count line 794~810 && line 830	2017-02-03 10:49:06 +08:00
winlin	a1fcf66f32	for #742, always enable http utilities.	2017-01-23 17:43:59 +08:00
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