3751 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	a3038b1274	fix the rtmp url parse bug.	2016-03-10 12:16:51 +08:00
winlin	82aa9d120c	for #5114, display metadata.	2016-03-07 16:02:37 +08:00
winlin	a8ee3162d4	Merge branch '2.0release' into develop	2016-03-03 15:30:38 +08:00
winlin	1df29de19d	update donation	2016-03-03 14:11:33 +08:00
winlin	d72b93e58b	fix the sed bug, to compatible with osx	2016-03-03 10:57:26 +08:00
winlin	00c60db7c3	Merge branch '2.0release' into develop	2016-01-31 22:47:48 +08:00
winlin	a9ed44ccc7	Merge branch 'master' into 2.0release	2016-01-31 22:47:36 +08:00
winlin	f7d9ed5ae4	update api	2016-01-31 21:49:53 +08:00
winlin	6008160ef4	update donation	2016-01-27 14:25:04 +08:00
winlin	4a56003798	update donation	2016-01-21 22:32:10 +08:00
winlin	8db25a0bf5	fix the log for mmap.	2016-01-21 16:18:42 +08:00
winlin	214eda745d	open null dev, not close stdout or stderr.	2016-01-20 14:53:25 +08:00
winlin	a5e5fd3784	refine readme	2016-01-20 14:21:58 +08:00
winlin	768cbd3a1a	refine readme	2016-01-20 14:21:00 +08:00
winlin	6c80ecbbf9	update readme	2016-01-20 14:19:53 +08:00
winlin	03469fc37d	refine code for process fork.	2016-01-20 14:09:14 +08:00
winlin	ce8f3b4478	refine the dup2 of stdout and stderr.	2016-01-20 14:05:48 +08:00
winlin	ae8bd4c2aa	should never close the fd 3+, for it myabe used.	2016-01-20 14:01:18 +08:00
winlin	a6dc17a67d	support redirect stdout by >	2016-01-20 14:00:01 +08:00
winlin	0cd15068de	set default buffer time to 0.5 for srs player.	2016-01-18 18:02:56 +08:00
winlin	27690f9e52	Merge branch '2.0release' into develop	2016-01-13 17:31:40 +08:00
winlin	b51cd599cc	add linked in page.	2016-01-13 17:31:33 +08:00
winlin	f8358da316	refine ingester log.	2016-01-13 16:20:05 +08:00
winlin	dfe5306327	fix process bug.	2016-01-13 16:18:50 +08:00
winlin	61c0c168b9	merge from srs2.	2016-01-13 12:52:19 +08:00
winlin	266397acee	merge from srs2	2016-01-13 12:46:23 +08:00
winlin	28080efec8	fix http reader bug, support infinite chunkted. 2.0.209	2016-01-13 12:44:51 +08:00
winlin	f971538cf3	refine http, support no host.	2016-01-12 11:53:52 +08:00
winlin	2941328ee8	rtmp edge support 302 redirect.	2016-01-11 15:46:23 +08:00
winlin	a11ab5ad24	merge from srs2.	2016-01-11 13:22:45 +08:00
winlin	e2e6e76f92	for #558 and #559, 2.0.208	2016-01-11 13:21:28 +08:00
winlin	d81b2cb140	support hls mount to vhost and reload	2016-01-11 13:15:46 +08:00
winlin	041040b846	ignore ingester when vhost disabled.	2016-01-11 13:11:14 +08:00
winlin	eac5440559	merge from srs2 #558 #559	2016-01-09 16:06:22 +08:00
winlin	da722b5b5d	Merge pull request #559 from tufang14/2.0release ... srs reusable thread need join	2016-01-09 16:00:58 +08:00
tufang14	56bffb6646	Update srs_app_thread.cpp	2016-01-09 15:54:23 +08:00
winlin	dbdd2f27b6	Merge pull request #558 from FlowerWrong/2.0release ... Add tcUrl to on_publish http hook for issue #548	2016-01-09 15:47:29 +08:00
flowerwrong	d42a58faf4	Keep blank of line	2016-01-09 15:10:24 +08:00
tufang14	233ff11172	srs reusable thread need join	2016-01-09 14:58:40 +08:00
winlin	d24aef50ba	for #369, support RTMP 302 api at protocol level.	2016-01-08 18:17:37 +08:00
flowerwrong	9ddd0054a1	Add tcUrl to on_publish http hook for issue #548	2016-01-08 15:10:25 +08:00
winlin	f1e7e9d933	support gmd. change work_dir. hourglass. add utilies.	2016-01-08 13:58:19 +08:00
winlin	c9b977d337	update donation	2016-01-06 16:34:47 +08:00
winlin	5338f21439	merge from srs2	2016-01-05 16:58:21 +08:00
winlin	8155e97b84	add keyword XCORE for coredump to identify the version. 2.0.207	2016-01-05 16:49:27 +08:00
winlin	e150fb3f70	merge from srs2	2016-01-04 17:42:50 +08:00
winlin	dc38ae1687	show first message when not show version.	2016-01-04 17:41:16 +08:00
winlin	9d22d09646	show signature of server.	2016-01-04 17:28:18 +08:00
winlin	973194c663	merge from srs2.	2015-12-31 16:02:01 +08:00
winlin	26211abf2e	refine code.	2015-12-31 15:57:16 +08:00