2826 commits

Author	SHA1	Message	Date
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	2015-12-28 18:13:40 +08:00
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	2015-12-28 18:02:20 +08:00
winlin	190db75835	refine code for nx_json modify the data when loads.	2015-12-28 17:39:24 +08:00
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	2015-12-28 17:15:44 +08:00
winlin	7ae2c6bf50	merge from srs2.	2015-12-26 12:17:51 +08:00
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	2015-12-26 12:13:17 +08:00
winlin	11e11005ac	specifies the try default vhost	2015-12-24 19:14:23 +08:00
winlin	d267b8fa19	fix bug for create connection with ip.	2015-12-24 17:38:49 +08:00
winlin	a7bf4bfda5	refine code, ignore client when no ip.	2015-12-24 17:25:05 +08:00
winlin	49308dddfb	update 2015 to 2016	2015-12-23 11:41:41 +08:00
winlin	d0c74fa7cd	update 2015 to 2016	2015-12-23 11:35:40 +08:00
winlin	714c13d88d	merge from srs2	2015-12-22 19:19:28 +08:00
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	2015-12-22 19:18:46 +08:00
winlin	65b81a4e68	merge from srs2	2015-12-22 17:01:06 +08:00
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	2015-12-22 17:00:22 +08:00
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	2015-12-22 16:48:06 +08:00
winlin	b881166f9a	merge from srs2	2015-12-22 16:18:09 +08:00
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	2015-12-22 16:13:49 +08:00
winlin	5f915aa959	merge from srs2	2015-12-22 15:40:03 +08:00
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	2015-12-22 15:39:12 +08:00
winlin	e124aeb614	Merge branch '2.0release' into develop	2015-12-15 16:25:27 +08:00
winlin	69d191e53f	refine the hls error log.	2015-12-15 16:25:21 +08:00
winlin	0ab64ccd2a	merge from srs2.	2015-12-15 16:06:40 +08:00
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	2015-12-15 16:02:02 +08:00
winlin	f6ff116505	refine code, persistence use isolate method.	2015-12-15 14:27:49 +08:00
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	2015-12-15 12:46:47 +08:00
winlin	26d328e7f2	fix bug for api, level should be string.	2015-12-14 18:43:20 +08:00
winlin	ffef3905af	merge from srs2.	2015-12-11 11:35:56 +08:00
winlin	5660e24953	fast stop server.	2015-12-11 11:30:36 +08:00
winlin	2830ee12c1	fix the on_hls.ts_url bug.	2015-12-11 11:29:10 +08:00
winlin	1e4c8f8bf3	fast stop server.	2015-12-11 10:30:13 +08:00
winlin	3ab5892863	refine comments.	2015-12-10 18:02:23 +08:00
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	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
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	2015-11-16 15:47:17 +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