3915 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	5ac8177ce6	fix bugs	2015-12-08 18:32:37 +08:00
winlin	fabcc91a0e	refine codes.	2015-12-07 18:22:55 +08:00
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	2015-12-07 11:35:05 +08:00
winlin	fba1122835	private the srs_vhost_resolve	2015-12-07 10:15:08 +08:00
winlin	17bb31cab1	fix the config bug.	2015-12-04 15:22:13 +08:00
winlin	eec2c34b5c	refine publisher.	2015-12-01 10:42:13 +08:00
winlin	cfe230438a	revert test code	2015-11-30 19:07:52 +08:00
winlin	6191e0af90	s1 compute key.	2015-11-30 19:05:25 +08:00
winlin	cafe886c3f	merge srs2	2015-11-27 17:46:00 +08:00
winlin	34d1ce9922	update readme, add gitter.	2015-11-27 17:45:04 +08:00
winlin	18eb8c81b3	merge from srs2	2015-11-16 18:10:06 +08:00
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	2015-11-16 18:06:44 +08:00
winlin	803c899a9b	Merge pull request #530 from YueHonghui/2.0release ... fix bug of fd leek in srs_app_server	2015-11-16 17:59:39 +08:00
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +08:00
winlin	51ed4b1e82	update donation	2015-11-13 14:57:00 +08:00
winlin	7ea0394b67	update donations	2015-11-12 17:37:44 +08:00
winlin	c77cefb6fa	refine the position of log script	2015-11-11 17:49:46 +08:00
winlin	44b26271bf	Merge branch '2.0release' into develop	2015-11-11 17:12:34 +08:00
winlin	c4c63f7825	fix build failed bug for osx.	2015-11-11 17:06:12 +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	6c7a51d310	Merge branch '2.0release' into develop	2015-11-10 12:16:08 +08:00
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	2015-11-10 12:16:01 +08:00
winlin	d2ccc4f661	Merge branch '2.0release' into develop	2015-11-10 12:15:00 +08:00
winlin	1c944ed451	Merge pull request #522 from ossrs/hotfix/commit ... use /usr/local/bin for osx.	2015-11-10 12:12:00 +08:00
winlin	8c04b17d08	use /usr/local/bin for osx.	2015-11-10 12:03:52 +08:00
winlin	7db7d43aea	Merge branch '2.0release' into develop	2015-11-09 15:25:55 +08:00
winlin	18b50d961f	support query server by id.	2015-11-09 15:19:50 +08:00
winlin	aca9fe805c	Merge branch '2.0release' into develop	2015-11-09 14:51:47 +08:00
winlin	d916c53702	refine the api server.	2015-11-09 14:51:41 +08:00
winlin	a3a6282fe9	merge srs2.	2015-11-06 10:52:29 +08:00
winlin	a89ed68aa3	update readme for #511.	2015-11-06 10:51:32 +08:00
winlin	75be18133d	fix build failed for utest.	2015-11-06 10:26:18 +08:00
winlin	6df4d1f05a	merge from srs2.	2015-11-05 15:12:49 +08:00
winlin	98e25def6c	fix utest build failed for osx.	2015-11-05 15:11:59 +08:00
winlin	97f5bb8b99	merge from srs2	2015-11-05 14:48:25 +08:00
zhengfl	38b81ce312	允许操作SrsStream中的函数时，长度为0.	2015-11-05 14:37:21 +08:00
zhengfl	1dae8fc987	fix #511, fix the bug of thread stop invalid.	2015-11-05 13:52:59 +08:00
winlin	6e3eb50b78	Merge branch '2.0release' into develop	2015-11-02 13:51:07 +08:00
winlin	6d0adb9f22	fix typo	2015-11-02 13:51:01 +08:00
winlin	302be41d00	merge from srs2.0.198	2015-11-02 13:49:27 +08:00
winlin	57536bf428	fix typo in readme.	2015-11-02 13:47:56 +08:00
winlin	2b21a63d8f	merge from srs2.	2015-11-02 13:43:22 +08:00
winlin	49d77b3f09	for #515, use srs_freepa and SrsAutoFreeA for array. 2.0.198	2015-11-02 13:42:05 +08:00
winlin	4b5eb5ea2d	fix the parse rtmp url bug for ingest.	2015-11-02 13:37:44 +08:00
winlin	e3407c1dd2	merge from srs2.	2015-11-02 11:49:23 +08:00
winlin	ec225b2108	quit child process when fork failed.	2015-11-02 11:46:33 +08:00
winlin	9d7826c681	quit child process when fork failed.	2015-11-02 11:44:22 +08:00
winlin	f57e537686	for #515, merge from srs2, use SrsAutoFreeA.	2015-11-02 11:29:20 +08:00
winlin	f4f76cd196	for #515, use SrsAutoFreeA to free the array.	2015-11-02 11:26:37 +08:00