2844 commits

Author	SHA1	Message	Date
winlin	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	041040b846	ignore ingester when vhost disabled.	2016-01-11 13:11:14 +08:00
winlin	eac5440559	merge from srs2 #558 #559	2016-01-09 16:06:22 +08:00
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	2016-01-09 16:00:58 +08:00
tufang14	56bffb6646	Update srs_app_thread.cpp	2016-01-09 15:54:23 +08:00
flowerwrong	d42a58faf4	Keep blank of line	2016-01-09 15:10:24 +08:00
tufang14	233ff11172	srs reusable thread need join	2016-01-09 14:58:40 +08:00
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	2016-01-08 18:17:37 +08:00
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	2016-01-08 15:10:25 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00
winlin	f516636448	refine code for hooks and http core.	2015-12-29 18:33:02 +08:00
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	2015-12-28 18:13:40 +08:00
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	2015-12-28 18:02:20 +08:00
winlin	190db75835	refine code for nx_json modify the data when loads.	2015-12-28 17:39:24 +08:00
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	2015-12-28 17:15:44 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	11e11005ac	specifies the try default vhost	2015-12-24 19:14:23 +08:00
winlin	d267b8fa19	fix bug for create connection with ip.	2015-12-24 17:38:49 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	714c13d88d	merge from srs2	2015-12-22 19:19:28 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	65b81a4e68	merge from srs2	2015-12-22 17:01:06 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	2015-12-22 16:48:06 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	5f915aa959	merge from srs2	2015-12-22 15:40:03 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	e124aeb614	Merge branch '2.0release' into develop	2015-12-15 16:25:27 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	2015-12-15 12:46:47 +08:00
winlin	26d328e7f2	fix bug for api, level should be string.	2015-12-14 18:43:20 +08:00
winlin	ffef3905af	merge from srs2.	2015-12-11 11:35:56 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	1e4c8f8bf3	fast stop server.	2015-12-11 10:30:13 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00