1111 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
winlin	a0472f256d	support test config file. change to 0.9.61	2014-04-13 16:55:42 +08:00
winlin	f980340e89	refine config option	2014-04-13 13:57:39 +08:00
winlin	aa784377fd	refine reload, ignore if parse config file failed.	2014-04-13 13:50:58 +08:00
winlin	cfee761899	support full reload. change to 0.9.60	2014-04-13 13:35:03 +08:00
winlin	bb87272c39	refine reload, rename some vhost specified to add vhost prefix	2014-04-13 13:31:59 +08:00
winlin	dc3c3cff8e	support reload http_stream	2014-04-13 13:27:51 +08:00
winlin	c33ff4fdb8	support reload http_api	2014-04-13 13:08:10 +08:00
winlin	17ac29d160	refine code for reload http api/stream	2014-04-12 22:16:39 +08:00
winlin	821b58af03	support reload atc	2014-04-12 22:00:27 +08:00
winlin	eda1ddc03d	support reload log level/logfile/tank	2014-04-12 21:35:26 +08:00
winlin	f652c28485	support reload pid.	2014-04-12 20:46:32 +08:00
winlin	0a016e58bf	add comments for main	2014-04-12 20:37:16 +08:00
winlin	b38df9cd1a	refine main object(server, config, log, context), handler reload in intialize(), change to 0.9.59	2014-04-12 20:35:40 +08:00
winlin	7c64a893f5	add demo.m3u8 and demo.html	2014-04-11 15:26:37 +08:00
winlin	9eb76cb1eb	update demo.conf	2014-04-11 14:40:38 +08:00
winlin	189da7e12e	fix bug of demo.conf	2014-04-11 14:23:19 +08:00
winlin	15f651bccd	update demo, support acodec	2014-04-11 14:13:14 +08:00
winlin	acdd5a827e	update api server, support servers	2014-04-11 11:29:17 +08:00
winlin	ff90278048	add speex1.2 to transcode flash encoder stream. change to 0.9.58	2014-04-11 10:40:21 +08:00
winlin	64727ce616	add bandwidth test conf	2014-04-10 17:41:55 +08:00
winlin	3a26b23fba	change ffmpeg log to ./objs	2014-04-10 17:19:49 +08:00
winlin	ca02cfe1bf	update server.py	2014-04-10 16:33:45 +08:00
winlin	c3c2767363	update api server, add servers	2014-04-10 15:06:18 +08:00
winlin	8295169e0e	refine code, unify the coding style	2014-04-10 14:22:09 +08:00
winlin	74cb41469c	update reame, add flash p2p to no-plan	2014-04-10 14:21:05 +08:00
winlin	ccba9ba9ba	move log level parse to app utility	2014-04-10 14:20:02 +08:00
winlin	f2f30dcc52	add utility, change log to trace	2014-04-10 14:12:22 +08:00
winlin	94874e77af	refine reload config	2014-04-10 14:06:23 +08:00
winlin	6c5d8b4851	refine reload config	2014-04-10 14:05:01 +08:00
winlin	bc61b1de18	fix bug of reload ingest	2014-04-10 11:47:38 +08:00
winlin	e0a6fe63cc	fix bug of reload ffmpeg, support multiple transcode, change to 0.9.57	2014-04-10 11:40:06 +08:00
winlin	9ed3421586	rename from get_ingest to get_ingest_by_id of config	2014-04-10 11:24:27 +08:00
winlin	e432fe931f	support reload ingesters(added/removed/updated). change to 0.9.57.	2014-04-10 11:21:47 +08:00
winlin	e6d8bc1e5c	ingest reload: support disable vhost	2014-04-10 10:35:02 +08:00
winlin	5e504944dc	add comments for http conn	2014-04-10 10:22:22 +08:00
winlin	dc71eef394	support ingest reload: add new vhost with ingester	2014-04-10 10:09:30 +08:00
winlin	e5646e3bb5	refine ingester, add vhost/id info to ingester	2014-04-10 09:20:23 +08:00
winlin	017b96f9b5	fix the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	2014-04-09 11:51:05 +08:00
winlin	056895a978	add comments for the heartbleed bug, see: http://www.openssl.org/news/secadv_20140407.txt	2014-04-09 11:06:53 +08:00
winlin	9372a7065a	refine the ingest log	2014-04-08 18:01:14 +08:00
winlin	4af7b6e383	update conf file, add id for ingest.	2014-04-08 15:51:43 +08:00
winlin	5a3b59d3c8	update conf file, add id for ingest.	2014-04-08 15:47:52 +08:00
winlin	ccf0a423be	change sleep time from 3s to 0.6s for ingester.	2014-04-08 15:43:47 +08:00
winlin	509504f27d	change sleep time from 3s to 0.6s	2014-04-08 15:43:18 +08:00
winlin	5aded78272	change to 0.9.56, for macro changed	2014-04-08 15:32:13 +08:00
winlin	eba35e2ac0	refine the macro SRS_FFMPEG to SRS_FFMPEG_STUB, SRS_FFMPEG_TOOL to build ffmpeg tool	2014-04-08 15:28:34 +08:00
winlin	70e73bc281	add comments for bug #39	2014-04-08 13:56:45 +08:00
winlin	d124772d6a	add http server/api to srs.conf. add comments for bug #6.	2014-04-08 13:54:16 +08:00
winlin	d6d371eba6	update reame, update the link of latest download	2014-04-07 17:22:38 +08:00
winlin	3b59a6c687	fix bug of package for arm	2014-04-07 17:03:56 +08:00