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
2014-06-21 12:58:33 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
e9c96af91a7fcbeadfa2b2cbbd888853f0760e85
e9c96af9
1 parent
41857eda
add wiki and conf for token traverse auth
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
32 行增加
和
1 行删除
README.md
trunk/conf/edge.conf
trunk/conf/edge.token.traverse.conf
trunk/conf/origin.conf
README.md
查看文件 @
e9c96af
...
...
@@ -212,6 +212,7 @@ Supported operating systems and hardware:
1.
Support RTMP
[
edge
](
https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
)
server, push/pull stream from any RTMP server
1.
Support tracable log, session based log.
1.
Support
[
vod stream(http flv/hls vod stream)
](
https://github.com/winlinvip/simple-rtmp-server/wiki/FlvVodStream
)
.
1.
Support DRM
[
token traverse
](
https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse
)
for fms origin authenticate.
1.
[
dev
]
Support system full utest on gtest.
1.
[
plan
]
Support RTMP 302 redirect
[
#92
](
https://github.com/winlinvip/simple-rtmp-server/issues/92
)
.
1.
[
plan
]
Support multiple processes, for both origin and edge
...
...
@@ -240,7 +241,7 @@ Supported operating systems and hardware:
*
2013-10-17, Created.
<br/>
## History
*
v1.0, 2014-06-21, support edge
token traverse
, fix
[
#104
](
https://github.com/winlinvip/simple-rtmp-server/issues/104
)
. 0.9.129
*
v1.0, 2014-06-21, support edge
[
token traverse
](
https://github.com/winlinvip/simple-rtmp-server/wiki/DRM#tokentraverse
)
, fix
[
#104
](
https://github.com/winlinvip/simple-rtmp-server/issues/104
)
. 0.9.129
*
v1.0, 2014-06-19, add connections count to api summaries. 0.9.127
*
v1.0, 2014-06-19, add srs bytes and kbps to api summaries. 0.9.126
*
v1.0, 2014-06-18, add network bytes to api summaries. 0.9.125
...
...
trunk/conf/edge.conf
0 → 100644
查看文件 @
e9c96af
# the config for srs origin-edge cluster
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
# @see full.conf for detail config.
listen
1935
;
pid
objs
/
edge
.
pid
;
srs_log_file
./
objs
/
edge
.
log
;
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
19350
;
}
...
...
trunk/conf/edge.token.traverse.conf
0 → 100644
查看文件 @
e9c96af
# the config for srs for token traverse authentication
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/DRM
# @see full.conf for detail config.
listen
1935
;
vhost
__
defaultVhost__
{
mode
remote
;
origin
127
.
0
.
0
.
1
:
19350
;
token_traverse
on
;
}
...
...
trunk/conf/origin.conf
0 → 100644
查看文件 @
e9c96af
# the config for srs origin-edge cluster
# @see https://github.com/winlinvip/simple-rtmp-server/wiki/Edge
# @see full.conf for detail config.
listen
19350
;
pid
objs
/
origin
.
pid
;
srs_log_file
./
objs
/
origin
.
log
;
vhost
__
defaultVhost__
{
}
...
...
请
注册
或
登录
后发表评论