external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

merge from 1.0release for bug #264. 2.0.74

Browse source
This commit is contained in:
winlin 2014-12-20 11:58:39 +08:00
commit eef8034632
6 changed files with 72 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/conf/full.conf
View file

@ -329,6 +329,12 @@ vhost with-hls.srs.com {
# the hls window in seconds, the number of ts in m3u8.
# default: 60
hls_window 60;
# the error strategy. canbe:
# ignore, when error ignore and disable hls.
# disconnect, when error disconnect the publish connection.
# @see https://github.com/winlinvip/simple-rtmp-server/issues/264
# default: ignore
hls_on_error ignore;
}
}
# the vhost with hls disabled.