diff --git a/README.md b/README.md index fb59ff309..c606b0494 100755 --- a/README.md +++ b/README.md @@ -178,6 +178,7 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv * nginx v1.5.0: 139524 lines
## History +* v1.0, 2014-03-26, Support RTMP ATC for HLS/HDS to support backup(failover). * v1.0, 2014-03-23, support daemon, default start in daemon. * v1.0, 2014-03-22, support make install/install-api and uninstall. * v1.0, 2014-03-22, add ./etc/init.d/srs, refine to support make clean then make. diff --git a/trunk/conf/demo.conf b/trunk/conf/demo.conf index b3c21a9af..191675302 100644 --- a/trunk/conf/demo.conf +++ b/trunk/conf/demo.conf @@ -4,7 +4,6 @@ listen 1935; chunk_size 60000; -log_dir ./objs/logs; max_connections 2000; vhost __defaultVhost__ {