2826 Commits (79fdc4e766ddd444f7f4a5b977cf54dab92d070c)

Author	SHA1	Message	Date
winlin	79fdc4e766	fix bug for rtmp client use NULL ptr.	9 years ago
winlin	96a4428bdb	refine the http request parse. edge retry timeout.	9 years ago
winlin	190db75835	refine code for nx_json modify the data when loads.	9 years ago
winlin	86a7db0adb	refine edge ingester, use upstream adapter.	9 years ago
winlin	7ae2c6bf50	merge from srs2.	9 years ago
winlin	eca46c03d2	refine code for consumer to refer the rtmp connection.	9 years ago
winlin	11e11005ac	specifies the try default vhost	9 years ago
winlin	d267b8fa19	fix bug for create connection with ip.	9 years ago
winlin	a7bf4bfda5	refine code, ignore client when no ip.	9 years ago
winlin	49308dddfb	update 2015 to 2016	9 years ago
winlin	d0c74fa7cd	update 2015 to 2016	9 years ago
winlin	714c13d88d	merge from srs2	9 years ago
winlin	5d3a183f43	fix #509, always alloc big object at heap. 2.0.205	9 years ago
winlin	65b81a4e68	merge from srs2	9 years ago
winlin	8b24319ffb	fix #418, ignore null connect props to make RED5 happy. 2.0.204	9 years ago
winlin	8d378cda2e	for #418, when simple handshake, copy s1 to c2.	9 years ago
winlin	b881166f9a	merge from srs2	9 years ago
winlin	c7850570c1	fix #546, thread terminate normally dispose bug. 2.0.203	9 years ago
winlin	5f915aa959	merge from srs2	9 years ago
winlin	cee8c3d07d	fix #541, failed when chunk size too small. 2.0.202	9 years ago
winlin	e124aeb614	Merge branch '2.0release' into develop	9 years ago
winlin	69d191e53f	refine the hls error log.	9 years ago
winlin	0ab64ccd2a	merge from srs2.	9 years ago
winlin	40457e6cab	default hls_on_error to continue. 2.0.201	9 years ago
winlin	f6ff116505	refine code, persistence use isolate method.	9 years ago
winlin	b486f6fe6b	refine /api/v1/summaries, with code and server id.	9 years ago
winlin	26d328e7f2	fix bug for api, level should be string.	9 years ago
winlin	ffef3905af	merge from srs2.	9 years ago
winlin	5660e24953	fast stop server.	9 years ago
winlin	2830ee12c1	fix the on_hls.ts_url bug.	9 years ago
winlin	1e4c8f8bf3	fast stop server.	9 years ago
winlin	3ab5892863	refine comments.	9 years ago
winlin	5ac8177ce6	fix bugs	9 years ago
winlin	fabcc91a0e	refine codes.	9 years ago
winlin	b2ae1acaa4	copy http-parser-2.1 into srs http stack.	9 years ago
winlin	fba1122835	private the srs_vhost_resolve	9 years ago
winlin	17bb31cab1	fix the config bug.	9 years ago
winlin	eec2c34b5c	refine publisher.	9 years ago
winlin	cfe230438a	revert test code	9 years ago
winlin	6191e0af90	s1 compute key.	9 years ago
winlin	18eb8c81b3	merge from srs2	9 years ago
winlin	2310b2da59	fix #518, fix fd leak bug when fork. 2.0.200	9 years ago
YueHonghui	eb4ca9ff5d	fix bug of fd leek in srs_app_server	9 years ago
winlin	c77cefb6fa	refine the position of log script	9 years ago
winlin	44b26271bf	Merge branch '2.0release' into develop	9 years ago
winlin	c4c63f7825	fix build failed bug for osx.	9 years ago
winlin	01c46bdbfd	rename org simle-rtmp-server to ossrs	9 years ago
winlin	1ffd5fd455	rename org simple-rtmp-server to ossrs	9 years ago
winlin	6c7a51d310	Merge branch '2.0release' into develop	9 years ago
winlin	1d8318d2fc	change simple-rtmp-server org to ossrs	9 years ago