27 commits

Author	SHA1	Message	Date
winlin	8ad7da1cb6	merge from 2.0	2016-09-02 15:25:20 +08:00
xubin	49853d2b8a	修复forward崩溃	2016-09-02 15:10:43 +08:00
winlin	7d96a33207	Merge branch '2.0release' into develop	2016-09-01 16:51:18 +08:00
winlin	e2865c6ac1	workaround for #511, the fly stfd in close. 2.0.211	2016-09-01 16:51:09 +08:00
winlin	36eb0981ec	merge from 2.0release	2016-08-08 14:09:10 +08:00
winlin	eac5440559	merge from srs2 #558 #559	2016-01-09 16:06:22 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +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	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
winlin	a9bb6061c3	use tcp client for raw connect.	2015-10-23 14:42:02 +08:00
winlin	20fcfb3eee	fix bug, use system utility	2015-10-23 14:42:02 +08:00
winlin	f187a7deef	refine the startup logs.	2015-09-24 12:15:12 +08:00
winlin	c5cd58761c	move the srs thread to st.	2015-09-19 13:46:55 +08:00
winlin	baa892a762	merge srs_app_st_socket to srs_app_st.	2015-06-14 08:43:38 +08:00
winlin	e5461d2df9	refine code	2015-05-28 07:03:38 +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	115daa3cc1	migarate from winlinvip to srs org	2015-04-29 17:06:32 +08:00
Nimrod A. Abing (on kohima)	bc93147426	for #308, disable st examples. for #334, refine the st init and event select.	2015-03-16 15:35:01 +08:00
winlin	db7ddfd510	fix #155, #135, support osx(darwin) for mac pro. 2.0.137.	2015-03-10 12:50:27 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	b830b995e6	fix bug #162, requires epoll. 0.9.222	2014-10-08 13:27:48 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	c85dde7f3f	substitute all TAB with 4spaces.	2014-03-18 11:32:58 +08:00
winlin	880f4f5dc2	final the modularity, rename the app module.	2014-03-02 21:49:09 +08:00

Renamed from trunk/src/app/srs_core_st.cpp (Browse further)