1280 commits

Author	SHA1	Message	Date
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	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	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	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	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
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	db6b8cf914	Fix #1057, switch to simple handshake. 3.0.28	2018-02-13 09:05:01 +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	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
winlin	1aa36f3bbc	Refine readme	2018-01-07 13:10:47 +08:00
winlin	7d4c4750dd	Refine readme	2018-01-07 12:44:54 +08:00
winlin	2e80403ecd	Refine readme	2018-01-07 12:44:25 +08:00
winlin	c67fe0323b	Refine product target	2018-01-07 10:51:18 +08:00
winlin	d9e37d2f54	Merge branch '2.0release' into 3.0release	2018-01-04 13:49:55 +08:00
winlin	a6bc53cb85	Merge #1039, fix bug of init.d script.	2018-01-04 13:49:11 +08:00
winlin	5730bf8e43	Fix #913, support complex error. 3.0.26	2018-01-01 23:03:42 +08:00
winlin	b426036832	Merge #1033, allow user to add some specific flags. 2.0.244	2018-01-01 23:01:13 +08:00
winlin	59b53dab8b	Merge from SRS2	2017-09-22 16:27:24 +08:00
winlin	a1df3c6f36	Remove CSDN mirror	2017-09-22 16:23:04 +08:00
winlin	b88265fc78	Update readme	2017-07-26 09:28:40 +08:00
winlin	ba2b82f29c	Refine English of Readme	2017-07-24 08:45:36 +08:00
winlin	1d35ae21ec	Update README.md	2017-06-30 10:30:16 +08:00
winlin	4d6c1b1a17	Update README.md	2017-06-29 09:38:20 +08:00
winlin	9c6d7a71d0	Update README.md	2017-06-29 09:38:03 +08:00
winlin	535fa034af	Update README.md	2017-06-29 09:37:16 +08:00
winlin	ad6f318ea6	Update README.md	2017-06-29 09:35:57 +08:00
winlin	92fb9b4a72	Update README.md	2017-06-28 09:54:14 +08:00
winlin	f871c26380	Update README.md	2017-06-28 09:38:05 +08:00
winlin	2207adebed	Update README.md	2017-06-28 09:27:45 +08:00
winlin	ec335c692d	Update README.md	2017-06-28 09:23:42 +08:00
winlin	6749582f1e	Update README.md	2017-06-28 09:21:06 +08:00
winlin	a5925ca904	Update README.md	2017-06-28 09:19:09 +08:00
winlin	159ef9e1c4	Update README.md	2017-06-28 09:18:13 +08:00
winlin	f9056caae0	Merge branch 'develop' into 3.0release	2017-06-28 09:09:00 +08:00
winlin	494879f6ed	Update README.md	2017-06-27 08:26:02 +08:00
winlin	f641f06171	Update README.md	2017-06-27 08:19:48 +08:00
winlin	34c73b6bec	Update README.md	2017-06-27 08:15:39 +08:00
winlin	9ae54850bf	Update readme for json	2017-06-11 14:06:54 +08:00
winlin	4e4091231e	Refine object create in server.	2017-06-10 14:19:10 +08:00
winlin	c32afb95ab	Release v2.0-r2, 2.0.243	2017-06-10 09:02:16 +08:00
winlin	e309be154e	Release v2.0-r2, 2.0.243	2017-06-10 08:59:14 +08:00
winlin	20cacd5ea0	Update readme for DASH	2017-06-10 08:54:59 +08:00