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
2015-08-30 22:23:47 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
01878e5a9c0fb7c1805107b669b48d43afc9157d
01878e5a
1 parent
b1b76a4a
for #319, query vhost detail.
隐藏空白字符变更
内嵌
并排对比
正在显示
4 个修改的文件
包含
24 行增加
和
6 行删除
trunk/conf/compatible.conf
trunk/conf/full.conf
trunk/conf/full.one.vhost.conf
trunk/src/app/srs_app_config.cpp
trunk/conf/compatible.conf
查看文件 @
01878e5
...
...
@@ -7,7 +7,7 @@ daemon off;
http_api
{
enabled
on
;
listen
1985
;
crossdomain
on
;
#
crossdomain on;
raw_api
{
enabled
on
;
allow_reload
on
;
...
...
trunk/conf/full.conf
查看文件 @
01878e5
...
...
@@ -180,12 +180,18 @@ stream_caster {
caster
mpegts_over_udp
;
# the output rtmp url.
# for mpegts_over_udp caster, the typically output url:
# rtmp://127.0.0.1/live/livestream
#
rtmp://127.0.0.1/live/livestream
# for rtsp caster, the typically output url:
# rtmp://127.0.0.1/[app]/[stream]
#
rtmp://127.0.0.1/[app]/[stream]
# for example, the rtsp url:
# rtsp://192.168.1.173:8544/live/livestream.sdp
# where the [app] is "live" and [stream] is "livestream", output is:
# where the [app] is "live" and [stream] is "livestream", output is:
# rtmp://127.0.0.1/live/livestream
# for flv caster, the typically output url:
# rtmp://127.0.0.1/[app]/[stream]
# for example, POST to url:
# http://127.0.0.1:8936/live/livestream.flv
# where the [app] is "live" and [stream] is "livestream", output is:
# rtmp://127.0.0.1/live/livestream
output
rtmp
://
127
.
0
.
0
.
1
/
live
/
livestream
;
# the listen port for stream caster.
...
...
trunk/conf/full.one.vhost.conf
查看文件 @
01878e5
listen
1935
;
listen
1935
1936
;
pid
./
objs
/
srs
.
pid
;
chunk_size
60000
;
ff_log_dir
./
objs
;
...
...
trunk/src/app/srs_app_config.cpp
查看文件 @
01878e5
...
...
@@ -1509,7 +1509,19 @@ int SrsConfig::global_to_json(SrsAmf0Object* obj)
}
else
if
(
sdir
->
name
==
"crossdomain"
)
{
sobj
->
set
(
sdir
->
name
,
sdir
->
dumps_arg0_to_boolean
());
}
else
if
(
sdir
->
name
==
"raw_api"
)
{
sobj
->
set
(
sdir
->
name
,
SrsAmf0Any
::
boolean
(
get_raw_api
()));
SrsAmf0Object
*
ssobj
=
SrsAmf0Any
::
object
();
sobj
->
set
(
sdir
->
name
,
ssobj
);
for
(
int
j
=
0
;
j
<
(
int
)
sdir
->
directives
.
size
();
j
++
)
{
SrsConfDirective
*
ssdir
=
sdir
->
directives
.
at
(
j
);
if
(
ssdir
->
name
==
"enabled"
)
{
ssobj
->
set
(
ssdir
->
name
,
ssdir
->
dumps_arg0_to_boolean
());
}
else
if
(
ssdir
->
name
==
"allow_reload"
)
{
ssobj
->
set
(
ssdir
->
name
,
ssdir
->
dumps_arg0_to_boolean
());
}
else
if
(
ssdir
->
name
==
"allow_query"
)
{
ssobj
->
set
(
ssdir
->
name
,
ssdir
->
dumps_arg0_to_boolean
());
}
}
}
}
obj
->
set
(
dir
->
name
,
sobj
);
...
...
请
注册
或
登录
后发表评论