4447 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	84f81983aa	Replace base64 to match MIT license. 3.0.32	2018-07-22 17:56:38 +08:00
winlin	0a63448b86	Replace crc32 MPEG and IEEE by pycrc to match MIT license. 3.0.31	2018-07-22 15:21:05 +08:00
winlin	e395878916	Replace crc32 IEEE by golang to match MIT license. 3.0.30	2018-07-21 20:58:20 +08:00
winlin	dea5e5bb48	Add utest or CRC32 IEEE, refine TABs of code	2018-07-21 19:09:32 +08:00
winlin	608c88b8f2	Merge 2.0release	2018-07-21 17:52:12 +08:00
winlin	6d7c7418a8	Merge #1119, fix memory leak. 2.0.249	2018-07-21 17:49:46 +08:00
winlin	551863a7ed	Refine code	2018-07-21 17:34:31 +08:00
winlin	f5c4d5a539	Release 2.0r3, SRS/2.0.248	2018-07-18 20:31:03 +08:00
winlin	5952671689	Release 2.0r3, SRS/2.0.248	2018-07-18 20:27:54 +08:00
winlin	693194dffe	Merge 2.0release	2018-07-18 19:26:53 +08:00
winlin	d27db215df	For #1176, should not close fd when success.	2018-07-18 19:21:29 +08:00
winlin	e4742ddac7	Merge 2.0release	2018-07-17 13:59:51 +08:00
winlin	2d49b9d1a7	Merge #1176, fix scaned issues. 2.0.248	2018-07-17 13:44:01 +08:00
winlin	dc6b329be3	Merge pull request #1176 from fastfading/2.0release ... fix security scan report issue #1172 #1173 #1174 #1175	2018-07-17 13:32:59 +08:00
Hui Zhang (huzhang2)	01ed485cf3	fix #1172 #1173 #1174 #1175 ... security scan report issue	2018-07-17 10:03:13 +08:00
Harlan	e9cb8210fc	fix default value error	2018-05-15 11:20:52 +08:00
Harlan	90f70d4cd3	CI test	2018-04-06 10:57:46 +08:00
Harlan	45a57acbb4	fix bug	2018-04-06 10:05:13 +08:00
Harlan	43ebd5958d	fix bug that only one stream can be encrypted..	2018-04-03 22:00:32 +08:00
winlin	dba44c7c3f	Merge branch 'develop' into 3.0release	2018-03-25 20:00:33 +08:00
xialixin	bb4e16ae3c	fix create dir success result check (#1080)	2018-03-25 17:48:07 +08:00
xialixin	aaf2905a9d	add: hls configuration adds [duration] variable (#1083)	2018-03-25 17:47:37 +08:00
Harlan	52596a0b04	add HLS encryption feature	2018-03-25 12:05:52 +08:00
winlin	0d78b908a7	Fix client tools resolve dns failed bug	2018-03-20 19:50:46 +08:00
winlin	c20b819a29	Refine readme	2018-03-03 10:04:21 +08:00
winlin	449c632e49	For #464: Add example for origin cluster	2018-03-03 10:01:01 +08:00
winlin	bd797ad385	Fix utest build failed for ::atoi	2018-03-03 09:33:15 +08:00
winlin	459272b94c	Merge #1077 from 2.0release	2018-02-28 14:10:09 +08:00
winlin	0fe17c3e34	Merge #1077, fix crash for edge HLS. 2.0.247	2018-02-28 13:37:30 +08:00
RocFang	fd016ed91a	use hls->initialize to set req of hls (#1077)	2018-02-28 13:35:33 +08:00
winlin	c528b4170e	Refine readme	2018-02-28 13:34:26 +08:00
winlin	4bf5ab2044	Fix #464, support RTMP origin cluster. 3.0.29	2018-02-16 16:40:48 +08:00
winlin	c70421e656	Fix #464, support origin cluster	2018-02-16 16:39:07 +08:00
winlin	2f09ec4353	For #464, refine result of origin cluster api	2018-02-16 14:13:14 +08:00
winlin	92f2bcd878	For #464, support config origin cluster	2018-02-16 10:31:19 +08:00
winlin	55c96192e2	For #464, refine code	2018-02-16 10:19:48 +08:00
winlin	ec362b2774	For #464, query origin info and ip addresses	2018-02-16 09:37:31 +08:00
winlin	469250f850	For #464, support origin cluster api	2018-02-15 20:55:34 +08:00
winlin	d0fbf44d18	For #464, support config for origin cluster.	2018-02-14 21:52:40 +08:00
winlin	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	2018-02-13 09:05:01 +08:00
winlin	a2cefe4dbd	For #1059, show more information from stream	2018-02-13 09:02:46 +08:00
winlin	681138d2af	Fix #1059, merge from 2.0, supports url with vhost in stream. 3.0.27	2018-02-13 08:52:57 +08:00
winlin	1721e4ea4b	Fix #1059, support vhost in stream parameters. 2.0.246	2018-02-13 08:31:25 +08:00
winlin	93d3e1464a	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:57 +08:00
winlin	366309ce2d	For #1045, revert macro for TCP keepalive detection, use system macro	2018-01-07 17:49:14 +08:00
winlin	049e7c82c0	Merge #1044, for #1045, set TCP SO_KEEPALIVE	2018-01-07 17:23:36 +08:00
winlin	911cd448f1	Merge #1045, for #1044, TCP connection alive detection. 2.0.245	2018-01-07 17:18:43 +08:00
juntaoliu	a6871052af	set tcp keepalive for tcp socket (#1045)	2018-01-07 17:03:13 +08:00
winlin	1aa36f3bbc	Refine readme	2018-01-07 13:10:47 +08:00
winlin	7d4c4750dd	Refine readme	2018-01-07 12:44:54 +08:00