Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2013-11-04 22:55:19 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
751323fac8ff7fa67daef246e86422531f6a5c01
751323fa
1 parent
58d9677d
release v0.3, 11773 lines
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
37 行增加
和
7 行删除
README.md
trunk/conf/srs.conf
trunk/src/core/srs_core_client.cpp
README.md
查看文件 @
751323f
...
...
@@ -35,17 +35,21 @@ url: rtmp://127.0.0.1:1935/live/livestream
6.
no multiple processes, single process only.
<br/>
### Releases
*
2013-11-04,
[
release v0.3
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.3
)
, support vhost, refer, gop cache, listen multiple ports. 11773 lines.
<br/>
*
2013-10-25,
[
release v0.2
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.2
)
, support flash publish, h264 codec, time jitter correct. 10125 lines.
<br/>
*
2013-10-23,
[
release v0.1
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/0.1
)
, support FMLE/FFMPEG publish, vp6 codec live streaming. 8287 lines.
<br/>
*
2013-10-17, created.
<br/>
### Compare
*
srs v0.3: 11773 lines.
<br/>
*
srs v0.2: 10125 lines.
<br/>
*
srs v0.1: 8287 lines.
<br/>
*
nginx-rtmp v1.0.4: 26786 lines
<br/>
*
nginx v1.5.0: 139524 lines
<br/>
### History
*
v0.3, 2013-11-04, v0.3 released. 11773 lines.
*
v0.3, 2013-11-04, support refer/play-refer/publish-refer.
*
v0.3, 2013-11-04, support vhosts specified config.
*
v0.3, 2013-11-02, support listen multiple ports.
*
v0.3, 2013-11-02, support config file in nginx-conf style.
...
...
trunk/conf/srs.conf
查看文件 @
751323f
listen
1935
19350
;
vhost
__
defaultVhost__
{
enabled
on
;
gop_cache
on
;
#refer github.com github.io;
#refer_publish github.com github.io;
refer_play
github
.
com
github
.
io
.
com
;
}
vhost
winlinvip
.
github
.
com
{
vhost
removed
.
vhost
.
com
{
# whether the vhost is enabled.
# if off, all request access denied.
# default: on
enabled
off
;
}
vhost
min
.
delay
.
com
{
# whether cache the last gop.
# if on, cache the last gop and dispatch to client,
# to enable fast startup for client, client play immediately.
# if off, send the latest media data to client,
# client need to wait for the next Iframe to decode and show the video.
# set to off if requires min delay;
# set to on if requires client fast startup.
# default: on
gop_cache
off
;
}
vhost
refer
.
anti_suck
.
com
{
# the common refer for play and publish.
# if the page url of client not in the refer, access denied.
# if not specified this field, allow all.
# default: not specified.
refer
github
.
com
github
.
io
;
# refer for publish clients specified.
# the common refer is not overrided by this.
# if not specified this field, allow all.
# default: not specified.
refer_publish
github
.
com
github
.
io
;
# refer for play clients specified.
# the common refer is not overrided by this.
# if not specified this field, allow all.
# default: not specified.
refer_play
github
.
com
github
.
io
;
}
...
...
trunk/src/core/srs_core_client.cpp
查看文件 @
751323f
...
...
@@ -215,7 +215,7 @@ int SrsClient::check_vhost()
}
SrsConfDirective
*
conf
=
NULL
;
if
((
conf
=
vhost
->
get
(
RTMP_VHOST_ENABLED
))
!=
NULL
&&
conf
->
arg0
()
==
"off
"
)
{
if
((
conf
=
vhost
->
get
(
RTMP_VHOST_ENABLED
))
!=
NULL
&&
conf
->
arg0
()
!=
"on
"
)
{
ret
=
ERROR_RTMP_VHOST_NOT_FOUND
;
srs_error
(
"vhost %s disabled. ret=%d"
,
req
->
vhost
.
c_str
(),
ret
);
return
ret
;
...
...
请
注册
或
登录
后发表评论