149 commits

Author	SHA1	Message	Date
winlin	dc11418c79	fix #274: http-callback support on_dvr when reap a dvr file. 2.0.89	2015-01-03 15:33:23 +08:00
winlin	75f2607685	fix #211, support security allow/deny publish/play all/ip. 2.0.86	2015-01-02 16:02:13 +08:00
winlin	569596c10d	update copyright, from 2013 to 2015	2014-12-31 20:32:09 +08:00
winlin	eef8034632	merge from 1.0release for bug #264. 2.0.74	2014-12-20 11:58:39 +08:00
winlin	1dfac0bf1d	fix #264, support disconnect publish connect when hls error. 1.0.11	2014-12-20 11:45:59 +08:00
winlin	5529813fcb	for bug #257, support NULL msg in msgs to send.	2014-12-13 11:22:40 +08:00
winlin	10297fab51	fix #257, support 0.1s+ latency. 2.0.70	2014-12-12 21:51:06 +08:00
winlin	32d537b96b	for bug #251, refine code before mic.	2014-12-06 19:56:06 +08:00
winlin	b1d7fbe668	fix #241, add mw(merged-write) config. 2.0.53	2014-12-04 21:35:13 +08:00
winlin	5589b13d2e	for bug #241, support mr(merged-read) config and reload. 2.0.52.	2014-12-04 18:21:04 +08:00
winlin	e7ccbce472	update PRIMARY, AUTHORS, CONTRIBUTORS rule. 2.0.32.	2014-11-25 10:41:55 +08:00
winlin	44962c9142	update PRIMARY, AUTHORS, CONTRIBUTORS rule	2014-11-25 10:06:26 +08:00
winlin	4f21e92ae0	fix the message of config for max_connections.	2014-11-11 18:49:27 +08:00
winlin	efc85ed6df	refine config, check the connections more precise	2014-11-11 17:19:56 +08:00
winlin	de5e2d0a40	Revert "Revert "for bug #194, refine the config"" ... This reverts commit b4c1d55311.	2014-11-11 17:12:45 +08:00
winlin	b4c1d55311	Revert "for bug #194, refine the config" ... This reverts commit 2a55ae4317.	2014-11-11 17:05:36 +08:00
winlin	2a55ae4317	for bug #194, refine the config	2014-11-11 15:38:21 +08:00
winlin	59f68a2655	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:35:06 +08:00
winlin	fe59783d83	add prefix wiki/v1_CN_ or wiki/v1_EN_ to wiki.	2014-10-24 11:28:50 +08:00
winlin	e46e7fc596	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:58:53 +08:00
winlin	6da21364f6	update readme, rename wiki/xxx to wiki/v1_xxx	2014-10-24 09:55:58 +08:00
winlin	d24e2fd0cc	remove supports for OSX. 2.0.1.	2014-10-18 13:58:23 +08:00
winlin	20ebf68ea5	fix hls bug, refine config and log, according to clion of jetbrains. 0.9.216.	2014-09-26 17:47:43 +08:00
winlin	83f266b9e2	fix #177, dvr segment add config dvr_wait_keyframe. 0.9.213.	2014-09-25 10:59:29 +08:00
winlin	901c9590e4	refine log, log important to file. 1.0.210	2014-08-29 15:07:04 +08:00
winlin	839101a036	reorder the config functions. add comments for st to support 100k threads, use MALLOC_STACK macro.	2014-08-27 12:28:05 +08:00
winlin	e656a65b6c	for bug #162, add conf and connections limit.	2014-08-19 15:52:59 +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	cf7504826b	fix reload ingest bug, remove when disabled. 0.9.196	2014-08-16 19:59:14 +08:00
winlin	7b24788445	for bug #143, build on centos5.	2014-08-02 22:18:39 +08:00
winlin	79c641e8d6	remove flashP2P hss dvr, for it's a can-not-run feature. 0.9.178	2014-07-30 10:00:23 +08:00
winlin	9c11001391	refine log for stats network and disk	2014-07-27 19:03:56 +08:00
winlin	6f700f3f40	rename network_device_index to network	2014-07-27 18:40:32 +08:00
winlin	f4ea48adcb	rename network_device_index to network	2014-07-27 18:39:20 +08:00
winlin	b334021836	add config item for the stat disk device name	2014-07-27 16:52:00 +08:00
winlin	e76036f40b	refine config heartbeat, add new stats. 0.9.175	2014-07-27 14:43:55 +08:00
winlin	ebf9e560b1	refine the max connections, compare the system ulimit max open files, error when exeed limit	2014-07-26 15:34:45 +08:00
winlin	5f7ff37e64	fix the utest mock config bug	2014-07-26 15:03:07 +08:00
winlin	50cd1d2360	refine the config	2014-07-25 11:05:54 +08:00
winlin	7865b0e935	refine config, check chunk size.	2014-07-25 11:04:13 +08:00
winlin	630bdf0c80	refine config, check the value of http api/stream.	2014-07-25 10:54:36 +08:00
winlin	7207c2f435	refine config, check all config item name.	2014-07-25 10:44:04 +08:00
winlin	1c27f3b913	refine config, warning when feature disabled.	2014-07-25 09:38:48 +08:00
winlin	2c9e16a9e7	add utest for config vhosts, transcode/dvr/hls	2014-07-22 11:01:20 +08:00
winlin	77236920b6	add config utest, for default vhost	2014-07-21 12:13:01 +08:00
winlin	f1b1dc0c64	add utest for config full.conf, fix the chunk-size bug	2014-07-21 10:50:08 +08:00
winlin	0db2e6b8e9	fix the empty config error	2014-07-20 17:08:47 +08:00
winlin	75bfe2af78	refine the LF,CR	2014-07-20 16:19:26 +08:00
winlin	8cd9be4fce	add comments for LF,CR	2014-07-20 16:18:26 +08:00
winlin	c65a6b5d63	fix the conf_line bug of parse config directive.	2014-07-20 16:16:29 +08:00