70 commits

Author	SHA1	Message	Date
winlin	8b74c7cb89	SquashSRS4: Happy 2021	2021-04-16 09:29:43 +08:00
winlin	4f1d213c91	Live: Support follow HTTP/302 for HTTP/HTTPS FLV edge.	2021-03-17 16:53:39 +08:00
winlin	181c9f25ed	Live: Support connect origin by HTTP-FLV/HTTPS-FLV	2021-02-19 18:16:05 +08:00
winlin	783029778c	Merge branch 'develop' into feature/rtc	2020-09-14 20:55:30 +08:00
winlin	905444a1c7	For #1684, Prevent stop ingest for multiple times. 3.0.143	2020-09-14 20:48:44 +08:00
chenchengbin	0aecc063e0	防止ingester多次调用stop导致崩溃	2020-09-14 20:44:47 +08:00
winlin	2135b638b1	Merge srs_app_thread.hpp to srs_app_conn.hpp	2020-09-11 16:44:40 +08:00
winlin	d783a12f89	Happy 2020	2019-12-30 10:10:35 +08:00
winlin	5a3fd1e68a	Release v3.0-a2, 3.0.67	2019-12-01 19:24:17 +08:00
winlin	517974d451	Refine redirect flow for origin cluster	2019-11-30 19:06:41 +08:00
winlin	6b2c71d385	Refine typo in files. 3.0.51	2019-04-30 08:30:13 +08:00
winlin	45009785fb	Refine typo in app.	2019-04-30 08:24:52 +08:00
winlin	d3dc45f357	Refine set_recv_timeout in time unit	2019-04-17 08:31:53 +08:00
winlin	c1b64ba24f	Refine get_queue_length and set_queue_size in time unit	2019-04-16 07:55:19 +08:00
winlin	b2d1d84634	Change to 2019	2019-01-01 21:37:28 +08:00
winlin	16fa4c588a	Rename ISrsProtocolReaderWriter to ISrsProtocolReadWriter	2018-12-23 20:08:04 +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	9802dc326e	For #913, source support complex error	2017-09-23 22:12:33 +08:00
winlin	9db2a04c3b	For #913, coroutine support complex error.	2017-06-11 18:44:20 +08:00
winlin	7cac35a289	For #913, source cycle error	2017-06-11 09:40:07 +08:00
winlin	6993ac226f	For #906, #902, use coroutine for reusable2 thread	2017-05-29 20:49:29 +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	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	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	2015-12-28 18:02:20 +08:00
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	2015-12-28 17:15:44 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +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	12e013142d	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	bc27481886	refine code, use simple rtmp client.	2015-10-23 14:42:02 +08:00
winlin	24b3899972	use SrsTcpClient instead raw socket.	2015-10-23 14:42:02 +08:00
winlin	d8f18aee37	use the right int type for port.	2015-09-24 18:33:07 +08:00
winlin	9ead08725d	use kernel utility int2str and float2str	2015-09-24 17:54:58 +08:00
winlin	1fd83d9314	refine the order.	2015-09-17 13:36:02 +08:00
winlin	da47f1648b	refine file mode to 644	2015-07-09 13:44:05 +08:00
zhengfl	f6a2cea716	refine code: 删除srs_app_edge中的user_stat相关代码。因为没有任何作用。	2015-07-09 10:08:17 +08:00
winlin	0aed408855	refine code, to 644 and unix encoding.	2015-07-08 17:44:25 +08:00
zhengfl	f9257b89e7	fix #438 ... 问题：edge模式，推流时异常断开。 解决方法：增加edge模式推流检测。	2015-07-08 15:43:09 +08:00
winlin	cfc0877ec9	refine the thread, add all callback.	2015-05-23 09:49:15 +08:00
winlin	e5f449ce36	refine the thread to three category.	2015-05-23 09:20:16 +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	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	f9b9a60de7	for bug #251, remove the SrsMessage, use SrsCommonMessage or SrsSharedPtrMessage. 2.0.60	2014-12-05 23:03:52 +08:00
winlin	f3002144fc	fix #180: crash for multiple edge publishing the same stream. 0.9.220.	2014-09-30 11:21:46 +08:00
winlin	e9e0cd757c	fix #160, support forward/edge to flussonic, disable debug_srs_upnode to make flussonic happy. 0.9.201.	2014-08-19 10:59:59 +08:00
winlin	5b28355a0b	fix #147, support identify the srs edge. 0.9.190.	2014-08-06 09:57:30 +08:00