external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

for #319, query vhost detail.

Browse source
This commit is contained in:
winlin 2015-08-30 22:23:47 +08:00
parent b1b76a4a80
commit 01878e5a9c
4 changed files with 24 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/conf/compatible.conf
View file

@ -7,7 +7,7 @@ daemon off;
http_api { http_api {
enabled on; enabled on;
listen 1985; listen 1985;
crossdomain on; #crossdomain on;
raw_api { raw_api {
enabled on; enabled on;
allow_reload on; allow_reload on;

12
trunk/conf/full.conf
View file

@ -180,12 +180,18 @@ stream_caster {
caster mpegts_over_udp; caster mpegts_over_udp;
# the output rtmp url. # the output rtmp url.
# for mpegts_over_udp caster, the typically output 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: # 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: # for example, the rtsp url:
# rtsp://192.168.1.173:8544/live/livestream.sdp # 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 # rtmp://127.0.0.1/live/livestream
output rtmp://127.0.0.1/live/livestream; output rtmp://127.0.0.1/live/livestream;
# the listen port for stream caster. # the listen port for stream caster.

2
trunk/conf/full.one.vhost.conf
View file

@ -1,4 +1,4 @@
listen 1935; listen 1935 1936;
pid ./objs/srs.pid; pid ./objs/srs.pid;
chunk_size 60000; chunk_size 60000;
ff_log_dir ./objs; ff_log_dir ./objs;

14
trunk/src/app/srs_app_config.cpp
View file

@ -1509,7 +1509,19 @@ int SrsConfig::global_to_json(SrsAmf0Object* obj)
} else if (sdir->name == "crossdomain") { } else if (sdir->name == "crossdomain") {
sobj->set(sdir->name, sdir->dumps_arg0_to_boolean()); sobj->set(sdir->name, sdir->dumps_arg0_to_boolean());
} else if (sdir->name == "raw_api") { } 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); obj->set(dir->name, sobj);